Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754172AbbGBVlB (ORCPT ); Thu, 2 Jul 2015 17:41:01 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:38127 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753764AbbGBVkt (ORCPT ); Thu, 2 Jul 2015 17:40:49 -0400 From: Matteo Croce To: linux-kernel@vger.kernel.org Cc: Matteo Croce Subject: [PATCH] remove duplicate includes Date: Thu, 2 Jul 2015 23:40:42 +0200 Message-Id: <1435873242-1289-1-git-send-email-matteo@openwrt.org> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 24865 Lines: 757 Remove duplicate include directive. Duplicates are found with a script like: for i in $(find -name '*.c'); do grep -H '#include' "$i" \ |sed -e 's/#include *//' -e '/<.*>/s/[<>]//g' -e '/".*"/s/"//g' \ |sort |uniq -d done includes like asm/syscalls_64.h that needs to be included more than once aren't removed, sorry if someone was removed by error Signed-off-by: Matteo Croce --- arch/arc/kernel/troubleshoot.c | 3 --- arch/arm/crypto/aes-ce-glue.c | 1 - arch/arm/mach-clps711x/board-edb7211.c | 1 - arch/arm/mach-ixp4xx/dsmg600-setup.c | 1 - arch/arm/mach-lpc32xx/phy3250.c | 1 - arch/arm/mach-omap1/board-voiceblue.c | 1 - arch/arm/mach-sa1100/hackkit.c | 1 - arch/arm/mm/mmu.c | 2 -- arch/arm/xen/mm.c | 1 - arch/blackfin/kernel/irqchip.c | 1 - arch/blackfin/mach-common/ints-priority.c | 1 - arch/nios2/mm/fault.c | 1 - arch/powerpc/kernel/time.c | 1 - arch/powerpc/kernel/traps.c | 3 +-- arch/powerpc/mm/numa.c | 1 - arch/sh/boards/mach-dreamcast/irq.c | 1 - arch/x86/kernel/process.c | 1 - arch/x86/kernel/smpboot.c | 1 - arch/x86/platform/ce4100/ce4100.c | 1 - arch/x86/xen/grant-table.c | 1 - crypto/jitterentropy-kcapi.c | 1 - drivers/block/skd_main.c | 1 - drivers/crypto/nx/nx.c | 1 - drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 1 - drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 1 - drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c | 1 - drivers/iio/accel/mma8452.c | 1 - drivers/media/usb/dvb-usb/dw2102.c | 1 - drivers/misc/cxl/native.c | 1 - drivers/misc/genwqe/card_base.c | 1 - drivers/misc/genwqe/card_ddcb.c | 1 - drivers/misc/genwqe/card_utils.c | 2 -- drivers/mmc/host/android-goldfish.c | 2 -- drivers/net/dsa/bcm_sf2.c | 1 - drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 1 - drivers/net/ethernet/freescale/gianfar.c | 2 -- drivers/net/vxlan.c | 1 - drivers/net/wireless/ath/ath10k/mac.c | 1 - drivers/net/wireless/ath/ath10k/wmi-tlv.c | 1 - drivers/net/wireless/ath/ath5k/debug.c | 1 - drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 1 - drivers/net/wireless/rtlwifi/rtl8821ae/trx.c | 1 - drivers/of/overlay.c | 1 - drivers/of/resolver.c | 1 - drivers/of/unittest.c | 1 - drivers/platform/x86/alienware-wmi.c | 1 - drivers/pnp/quirks.c | 2 -- drivers/power/axp288_charger.c | 1 - drivers/power/axp288_fuel_gauge.c | 1 - drivers/scsi/qla2xxx/qla_nx2.c | 2 -- drivers/thermal/of-thermal.c | 1 - fs/ext4/crypto_fname.c | 1 - fs/nfs/dns_resolve.c | 1 - tools/testing/selftests/timers/skew_consistency.c | 1 - 54 files changed, 1 insertion(+), 63 deletions(-) diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c index e0cf998..691832a 100644 --- a/arch/arc/kernel/troubleshoot.c +++ b/arch/arc/kernel/troubleshoot.c @@ -245,9 +245,6 @@ void show_kernel_fault_diag(const char *str, struct pt_regs *regs, #ifdef CONFIG_DEBUG_FS -#include -#include -#include #include #include #include diff --git a/arch/arm/crypto/aes-ce-glue.c b/arch/arm/crypto/aes-ce-glue.c index b445a5d..bb14076 100644 --- a/arch/arm/crypto/aes-ce-glue.c +++ b/arch/arm/crypto/aes-ce-glue.c @@ -10,7 +10,6 @@ #include #include -#include #include #include #include diff --git a/arch/arm/mach-clps711x/board-edb7211.c b/arch/arm/mach-clps711x/board-edb7211.c index f339797..c46c5b4 100644 --- a/arch/arm/mach-clps711x/board-edb7211.c +++ b/arch/arm/mach-clps711x/board-edb7211.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c index 43ee06d..b3bd0e1 100644 --- a/arch/arm/mach-ixp4xx/dsmg600-setup.c +++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c @@ -26,7 +26,6 @@ #include #include #include -#include #include diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c index 7858d5b..383ce30 100644 --- a/arch/arm/mach-lpc32xx/phy3250.c +++ b/arch/arm/mach-lpc32xx/phy3250.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index e960687..0c91dc3 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c index 643d5f2..0016d25 100644 --- a/arch/arm/mach-sa1100/hackkit.c +++ b/arch/arm/mach-sa1100/hackkit.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 6ca7d9a..372c7c0 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -36,7 +35,6 @@ #include #include #include -#include #include "mm.h" #include "tcm.h" diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index 03e75fe..ecda4a4 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c index 0ba2576..cff0457 100644 --- a/arch/blackfin/kernel/irqchip.c +++ b/arch/blackfin/kernel/irqchip.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index 7236bdf..0c5abeb 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c @@ -26,7 +26,6 @@ #include #include #include -#include /* * NOTES: diff --git a/arch/nios2/mm/fault.c b/arch/nios2/mm/fault.c index b51878b..32bf4a3 100644 --- a/arch/nios2/mm/fault.c +++ b/arch/nios2/mm/fault.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 4392250..eadef55 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -74,7 +74,6 @@ /* powerpc clocksource/clockevent code */ -#include #include static cycle_t rtc_read(struct clocksource *); diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 6530f1b..414a6d1 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -51,14 +51,13 @@ #ifdef CONFIG_PPC64 #include #include -#include #endif +#include #include #include #include #include #include -#include #include #include diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 5e80621..5a4420b 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/sh/boards/mach-dreamcast/irq.c b/arch/sh/boards/mach-dreamcast/irq.c index 2789647..69fa91c 100644 --- a/arch/sh/boards/mach-dreamcast/irq.c +++ b/arch/sh/boards/mach-dreamcast/irq.c @@ -10,7 +10,6 @@ */ #include #include -#include #include #include #include diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 9cad694..c412011 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 8add66b..34f77ba 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -73,7 +73,6 @@ #include #include #include -#include #include /* Number of siblings per CPU package */ diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c index 701fd58..c384bf0 100644 --- a/arch/x86/platform/ce4100/ce4100.c +++ b/arch/x86/platform/ce4100/ce4100.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include diff --git a/arch/x86/xen/grant-table.c b/arch/x86/xen/grant-table.c index 1580e7a..5a1e317 100644 --- a/arch/x86/xen/grant-table.c +++ b/arch/x86/xen/grant-table.c @@ -113,7 +113,6 @@ int arch_gnttab_init(unsigned long nr_shared) #ifdef CONFIG_XEN_PVH #include #include -#include static int __init xlated_setup_gnttab_pages(void) { struct page **pages; diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c index b32d834..2fb614f 100644 --- a/crypto/jitterentropy-kcapi.c +++ b/crypto/jitterentropy-kcapi.c @@ -39,7 +39,6 @@ #include #include -#include #include #include #include diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c index 1e46eb2..1ed9104 100644 --- a/drivers/block/skd_main.c +++ b/drivers/block/skd_main.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/crypto/nx/nx.c b/drivers/crypto/nx/nx.c index f6198f2..fdc7662 100644 --- a/drivers/crypto/nx/nx.c +++ b/drivers/crypto/nx/nx.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index 14242bd..c12b725 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c @@ -41,7 +41,6 @@ #include "gca/gfx_8_0_d.h" #include "gca/gfx_8_0_enum.h" #include "gca/gfx_8_0_sh_mask.h" -#include "gca/gfx_8_0_enum.h" #include "uvd/uvd_5_0_d.h" #include "uvd/uvd_5_0_sh_mask.h" diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c index a5e99ac..96fd5e8 100644 --- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c @@ -32,7 +32,6 @@ #include #include