remove duplicate includes
Subsystems (46)
PATCH 1/1 remove duplicate includes
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 <[email protected]>
--- 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(-)
arch/arc/kernel/troubleshoot.c +0 -3
@@ -245,9 +245,6 @@ void show_kernel_fault_diag(const char *str, struct pt_regs *regs,#ifdef CONFIG_DEBUG_FS -#include <linux/module.h> -#include <linux/fs.h> -#include <linux/mount.h> #include <linux/pagemap.h> #include <linux/init.h> #include <linux/namei.h>
arch/arm/crypto/aes-ce-glue.c +0 -1
@@ -10,7 +10,6 @@#include <asm/hwcap.h> #include <asm/neon.h> -#include <asm/hwcap.h> #include <crypto/aes.h> #include <crypto/ablk_helper.h> #include <crypto/algapi.h>
arch/arm/mach-clps711x/board-edb7211.c +0 -1
@@ -17,7 +17,6 @@#include <linux/platform_device.h> #include <linux/pwm.h> #include <linux/pwm_backlight.h> -#include <linux/memblock.h> #include <linux/mtd/physmap.h> #include <linux/mtd/partitions.h>
arch/arm/mach-ixp4xx/dsmg600-setup.c +0 -1
@@ -26,7 +26,6 @@#include <linux/reboot.h> #include <linux/i2c.h> #include <linux/i2c-gpio.h> -#include <linux/gpio.h> #include <mach/hardware.h>
arch/arm/mach-lpc32xx/phy3250.c +0 -1
@@ -23,7 +23,6 @@#include <linux/interrupt.h> #include <linux/irq.h> #include <linux/dma-mapping.h> -#include <linux/device.h> #include <linux/gpio.h> #include <linux/amba/bus.h> #include <linux/amba/clcd.h>
arch/arm/mach-omap1/board-voiceblue.c +0 -1
@@ -26,7 +26,6 @@#include <linux/serial_reg.h> #include <linux/smc91x.h> #include <linux/export.h> -#include <linux/reboot.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-sa1100/hackkit.c +0 -1
@@ -22,7 +22,6 @@#include <linux/serial_core.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> -#include <linux/tty.h> #include <linux/gpio.h> #include <linux/leds.h> #include <linux/platform_device.h>
arch/arm/mm/mmu.c +0 -2
@@ -23,7 +23,6 @@#include <asm/sections.h> #include <asm/cachetype.h> #include <asm/fixmap.h> -#include <asm/sections.h> #include <asm/setup.h> #include <asm/smp_plat.h> #include <asm/tlb.h>
@@ -36,7 +35,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/mach/pci.h> -#include <asm/fixmap.h> #include "mm.h" #include "tcm.h"
arch/arm/xen/mm.c +0 -1
@@ -8,7 +8,6 @@#include <linux/of_address.h> #include <linux/slab.h> #include <linux/types.h> -#include <linux/dma-mapping.h> #include <linux/vmalloc.h> #include <linux/swiotlb.h>
arch/blackfin/kernel/irqchip.c +0 -1
@@ -11,7 +11,6 @@#include <linux/kallsyms.h> #include <linux/interrupt.h> #include <linux/irq.h> -#include <linux/seq_file.h> #include <asm/irq_handler.h> #include <asm/trace.h> #include <asm/pda.h>
arch/blackfin/mach-common/ints-priority.c +0 -1
@@ -26,7 +26,6 @@#include <asm/gpio.h> #include <asm/irq_handler.h> #include <asm/dpmc.h> -#include <asm/traps.h> /* * NOTES:
arch/nios2/mm/fault.c +0 -1
@@ -23,7 +23,6 @@#include <linux/mm.h> #include <linux/module.h> #include <linux/uaccess.h> -#include <linux/ptrace.h> #include <asm/mmu_context.h> #include <asm/traps.h>
arch/powerpc/kernel/time.c +0 -1
@@ -74,7 +74,6 @@/* powerpc clocksource/clockevent code */ -#include <linux/clockchips.h> #include <linux/timekeeper_internal.h> static cycle_t rtc_read (struct clocksource *);
arch/powerpc/kernel/traps.c +1 -2
@@ -51,14 +51,13 @@#ifdef CONFIG_PPC64 #include <asm/firmware.h> #include <asm/processor.h> -#include <asm/tm.h> #endif +#include <asm/tm.h> #include <asm/kexec.h> #include <asm/ppc-opcode.h> #include <asm/rio.h> #include <asm/fadump.h> #include <asm/switch_to.h> -#include <asm/tm.h> #include <asm/debug.h> #include <sysdev/fsl_pci.h>
arch/powerpc/mm/numa.c +0 -1
@@ -33,7 +33,6 @@#include <asm/sparsemem.h> #include <asm/prom.h> #include <asm/smp.h> -#include <asm/cputhreads.h> #include <asm/topology.h> #include <asm/firmware.h> #include <asm/paca.h>
arch/sh/boards/mach-dreamcast/irq.c +0 -1
@@ -10,7 +10,6 @@*/ #include <linux/irq.h> #include <linux/io.h> -#include <linux/irq.h> #include <linux/export.h> #include <linux/err.h> #include <mach/sysasic.h>
arch/x86/kernel/process.c +0 -1
@@ -15,7 +15,6 @@#include <linux/dmi.h> #include <linux/utsname.h> #include <linux/stackprotector.h> -#include <linux/tick.h> #include <linux/cpuidle.h> #include <trace/events/power.h> #include <linux/hw_breakpoint.h>
arch/x86/kernel/smpboot.c +0 -1
@@ -73,7 +73,6 @@#include <asm/uv/uv.h> #include <linux/mc146818rtc.h> #include <asm/i8259.h> -#include <asm/realmode.h> #include <asm/misc.h> /* Number of siblings per CPU package */
arch/x86/platform/ce4100/ce4100.c +0 -1
@@ -15,7 +15,6 @@#include <linux/reboot.h> #include <linux/serial_reg.h> #include <linux/serial_8250.h> -#include <linux/reboot.h> #include <asm/ce4100.h> #include <asm/prom.h>
arch/x86/xen/grant-table.c +0 -1
@@ -113,7 +113,6 @@ int arch_gnttab_init(unsigned long nr_shared)#ifdef CONFIG_XEN_PVH #include <xen/balloon.h> #include <xen/events.h> -#include <linux/slab.h> static int __init xlated_setup_gnttab_pages (void ) {struct page **pages;
crypto/jitterentropy-kcapi.c +0 -1
@@ -39,7 +39,6 @@#include <linux/module.h> #include <linux/slab.h> -#include <linux/module.h> #include <linux/fips.h> #include <linux/time.h> #include <linux/crypto.h>
drivers/block/skd_main.c +0 -1
@@ -36,7 +36,6 @@#include <linux/scatterlist.h> #include <linux/version.h> #include <linux/err.h> -#include <linux/scatterlist.h> #include <linux/aer.h> #include <linux/ctype.h> #include <linux/wait.h>
drivers/crypto/nx/nx.c +0 -1
@@ -32,7 +32,6 @@#include <linux/scatterlist.h> #include <linux/device.h> #include <linux/of.h> -#include <linux/types.h> #include <asm/hvcall.h> #include <asm/vio.h>
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +0 -1
@@ -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"
drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +0 -1
@@ -32,7 +32,6 @@#include <linux/slab.h> #include <video/mipi_display.h> #include <asm/intel-mid.h> -#include <video/mipi_display.h> #include "i915_drv.h" #include "intel_drv.h" #include "intel_dsi.h"
drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c +0 -1
@@ -35,7 +35,6 @@#include <subdev/timer.h> #include <subdev/fb.h> #include <subdev/instmem.h> -#include <subdev/mmu.h> #include <subdev/volt.h> #include <engine/dmaobj.h>
drivers/iio/accel/mma8452.c +0 -1
@@ -16,7 +16,6 @@#include <linux/i2c.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> -#include <linux/iio/trigger_consumer.h> #include <linux/iio/buffer.h> #include <linux/iio/trigger.h> #include <linux/iio/trigger_consumer.h>
drivers/media/usb/dvb-usb/dw2102.c +0 -1
@@ -33,7 +33,6 @@#include "tda18271.h" #include "cxd2820r.h" #include "m88ds3103.h" -#include "ts2020.h" /* Max transfer size done by I2C transfer functions */ #define MAX_XFER_SIZE 64
drivers/misc/cxl/native.c +0 -1
@@ -10,7 +10,6 @@#include <linux/spinlock.h> #include <linux/sched.h> #include <linux/slab.h> -#include <linux/sched.h> #include <linux/mutex.h> #include <linux/mm.h> #include <linux/uaccess.h>
drivers/misc/genwqe/card_base.c +0 -1
@@ -34,7 +34,6 @@#include <linux/wait.h> #include <linux/delay.h> #include <linux/dma-mapping.h> -#include <linux/module.h> #include <linux/notifier.h> #include <linux/device.h> #include <linux/log2.h>
drivers/misc/genwqe/card_ddcb.c +0 -1
@@ -34,7 +34,6 @@#include <linux/string.h> #include <linux/dma-mapping.h> #include <linux/delay.h> -#include <linux/module.h> #include <linux/interrupt.h> #include <linux/crc-itu-t.h>
drivers/misc/genwqe/card_utils.c +0 -2
@@ -32,11 +32,9 @@#include <linux/iommu.h> #include <linux/delay.h> #include <linux/pci.h> -#include <linux/dma-mapping.h> #include <linux/ctype.h> #include <linux/module.h> #include <linux/platform_device.h> -#include <linux/delay.h> #include <asm/pgtable.h> #include "genwqe_driver.h"
drivers/mmc/host/android-goldfish.c +0 -2
@@ -42,13 +42,11 @@#include <linux/spinlock.h> #include <linux/timer.h> #include <linux/clk.h> -#include <linux/scatterlist.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/types.h> -#include <asm/io.h> #include <asm/uaccess.h> #define DRIVER_NAME "goldfish_mmc"
drivers/net/dsa/bcm_sf2.c +0 -1
@@ -14,7 +14,6 @@#include <linux/netdevice.h> #include <linux/interrupt.h> #include <linux/platform_device.h> -#include <linux/of.h> #include <linux/phy.h> #include <linux/phy_fixed.h> #include <linux/mii.h>
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +0 -1
@@ -62,7 +62,6 @@#include <net/netevent.h> #include <net/addrconf.h> #include <net/bonding.h> -#include <net/addrconf.h> #include <asm/uaccess.h> #include "cxgb4.h"
drivers/net/ethernet/freescale/gianfar.c +0 -2
@@ -102,8 +102,6 @@#include <linux/phy_fixed.h> #include <linux/of.h> #include <linux/of_net.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> #include "gianfar.h"
drivers/net/vxlan.c +0 -1
@@ -42,7 +42,6 @@#include <net/netns/generic.h> #include <net/vxlan.h> #include <net/protocol.h> -#include <net/udp_tunnel.h> #if IS_ENABLED (CONFIG_IPV6 )#include <net/ipv6.h> #include <net/addrconf.h>
drivers/net/wireless/ath/ath10k/mac.c +0 -1
@@ -23,7 +23,6 @@#include "hif.h" #include "core.h" #include "debug.h" -#include "wmi.h" #include "htt.h" #include "txrx.h" #include "testmode.h"
drivers/net/wireless/ath/ath10k/wmi-tlv.c +0 -1
@@ -18,7 +18,6 @@#include "debug.h" #include "mac.h" #include "hw.h" -#include "mac.h" #include "wmi.h" #include "wmi-ops.h" #include "wmi-tlv.h"
drivers/net/wireless/ath/ath5k/debug.c +0 -1
@@ -66,7 +66,6 @@#include <linux/seq_file.h> #include <linux/list.h> -#include <linux/vmalloc.h> #include "debug.h" #include "ath5k.h" #include "reg.h"
drivers/net/wireless/rtlwifi/rtl8188ee/trx.c +0 -1
@@ -33,7 +33,6 @@#include "trx.h" #include "led.h" #include "dm.h" -#include "phy.h" static u8 _rtl88ee_map_hwqueue_to_fwqueue (struct sk_buff *skb,u8 hw_queue) {
drivers/net/wireless/rtlwifi/rtl8821ae/trx.c +0 -1
@@ -33,7 +33,6 @@#include "trx.h" #include "led.h" #include "dm.h" -#include "phy.h" #include "fw.h" static u8 _rtl8821ae_map_hwqueue_to_fwqueue (struct sk_buff *skb,u8 hw_queue)
drivers/of/overlay.c +0 -1
@@ -16,7 +16,6 @@#include <linux/string.h> #include <linux/ctype.h> #include <linux/errno.h> -#include <linux/string.h> #include <linux/slab.h> #include <linux/err.h> #include <linux/idr.h>
drivers/of/resolver.c +0 -1
@@ -16,7 +16,6 @@#include <linux/string.h> #include <linux/ctype.h> #include <linux/errno.h> -#include <linux/string.h> #include <linux/slab.h> /* illegal phandle value (set when unresolved) */
drivers/of/unittest.c +0 -1
@@ -18,7 +18,6 @@#include <linux/slab.h> #include <linux/device.h> #include <linux/platform_device.h> -#include <linux/of_platform.h> #include <linux/i2c.h> #include <linux/i2c-mux.h>
drivers/platform/x86/alienware-wmi.c +0 -1
@@ -21,7 +21,6 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/dmi.h> -#include <linux/acpi.h> #include <linux/leds.h> #define LEGACY_CONTROL_GUID "A90597CE-A997-11DA-B012-B622A1EF5492"
drivers/pnp/quirks.c +0 -2
@@ -226,8 +226,6 @@ static void quirk_ad1815_mpu_resources(struct pnp_dev *dev)dev_info (&dev->dev,"made independent IRQ optional\n" ); } -#include <linux/pci.h> -static void quirk_system_pci_resources (struct pnp_dev *dev) {struct pci_dev *pdev =NULL ;
drivers/power/axp288_charger.c +0 -1
@@ -23,7 +23,6 @@#include <linux/usb/otg.h> #include <linux/notifier.h> #include <linux/power_supply.h> -#include <linux/notifier.h> #include <linux/property.h> #include <linux/mfd/axp20x.h> #include <linux/extcon.h>
drivers/power/axp288_fuel_gauge.c +0 -1
@@ -22,7 +22,6 @@#include <linux/regmap.h> #include <linux/jiffies.h> #include <linux/interrupt.h> -#include <linux/device.h> #include <linux/workqueue.h> #include <linux/mfd/axp20x.h> #include <linux/platform_device.h>
drivers/scsi/qla2xxx/qla_nx2.c +0 -2
@@ -11,8 +11,6 @@#include "qla_def.h" #include "qla_gbl.h" -#include <linux/delay.h> -#define TIMEOUT_100_MS 100/* 8044 Flash Read/Write functions */
drivers/thermal/of-thermal.c +0 -1
@@ -30,7 +30,6 @@#include <linux/err.h> #include <linux/export.h> #include <linux/string.h> -#include <linux/thermal.h> #include "thermal_core.h"
fs/ext4/crypto_fname.c +0 -1
@@ -19,7 +19,6 @@#include <linux/gfp.h> #include <linux/kernel.h> #include <linux/key.h> -#include <linux/key.h> #include <linux/list.h> #include <linux/mempool.h> #include <linux/random.h>
fs/nfs/dns_resolve.c +0 -1
@@ -37,7 +37,6 @@ ssize_t nfs_dns_resolve_name(struct net *net, char *name, size_t namelen,#include <linux/string.h> #include <linux/kmod.h> #include <linux/slab.h> -#include <linux/module.h> #include <linux/socket.h> #include <linux/seq_file.h> #include <linux/inet.h>
tools/testing/selftests/timers/skew_consistency.c +0 -1
@@ -32,7 +32,6 @@#include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <stdlib.h> #include <string.h> #include <sys/wait.h> #ifdef KTEST
Signature · 1 line
2.1.4