treewide: remove duplicate includes · tjh.dev/kernel@e44ba03

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

treewide: remove duplicate includes

Many stupid corrections of duplicated includes based on the output of
scripts/checkincludes.pl.

Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

authored by

Vitaliy Ivanov and committed by

Jiri Kosina 15 years ago e44ba033 1816315b

+11 -69

44 changed files

expand all collapse all

arch

arm

mach-s3c2410

h1940-bluetooth.c

mips

lantiq

devices.c

xway

devices.c

powerpc

platforms

pseries

smp.c

s390

kvm

sie64a.S

oprofile

init.c

x86

kvm

mmu.c

xtensa

include

asm

uaccess.h

drivers

gpio

ab8500-gpio.c

gpu

drm

nouveau

nv50_graph.c

media

ite-cir.c

video

m5mols

m5mols_capture.c

videobuf2-memops.c

net

can

c_can

c_can.c

c_can_platform.c

sungem.c

wireless

ath

ath5k

ahb.c

staging

ath6kl

linux

include

ar6000_drv.h

bcm

headers.h

brcm80211

brcmfmac

dhd_sdio.c

wl_cfg80211.h

wl_iw.c

gma500

psb_2d.c

hv_mouse.c

tools

hv_kvp_daemon.c

nvec

nvec.c

rtl8712

drv_types.h

osdep_service.h

sep

sep_driver.c

usbip

userspace

src

utils.h

westbridge

astoria

arch

arm

plat-omap

include

mach

westbridge

westbridge-omap3-pnand-hal

cyashalomap_kernel.h

gadget

cyasgadget.h

target

loopback

tcm_loop.c

tcm_fc

tfc_cmd.c

tfc_conf.c

tfc_io.c

tfc_sess.c

usb

otg

otg_fsm.c

video

udlfb.c

watchdog

intel_scu_watchdog.c

nfs

idmap.c

ocfs2

move_extents.c

include

linux

fs.h

net

ipv4

ping.c

-1

arch/arm/mach-s3c2410/h1940-bluetooth.c

reviewed

··· 18 18 #include <linux/leds.h> 19 19 #include <linux/gpio.h> 20 20 #include <linux/rfkill.h> 21 21 - #include <linux/leds.h> 22 21 23 22 #include <mach/regs-gpio.h> 24 23 #include <mach/hardware.h>

-2

arch/mips/lantiq/devices.c

reviewed

··· 15 15 #include <linux/platform_device.h> 16 16 #include <linux/leds.h> 17 17 #include <linux/etherdevice.h> 18 18 - #include <linux/reboot.h> 19 18 #include <linux/time.h> 20 19 #include <linux/io.h> 21 20 #include <linux/gpio.h> 22 22 - #include <linux/leds.h> 23 21 24 22 #include <asm/bootinfo.h> 25 23 #include <asm/irq.h>

-2

arch/mips/lantiq/xway/devices.c

reviewed

··· 16 16 #include <linux/platform_device.h> 17 17 #include <linux/leds.h> 18 18 #include <linux/etherdevice.h> 19 19 - #include <linux/reboot.h> 20 19 #include <linux/time.h> 21 20 #include <linux/io.h> 22 21 #include <linux/gpio.h> 23 23 - #include <linux/leds.h> 24 22 25 23 #include <asm/bootinfo.h> 26 24 #include <asm/irq.h>

-1

arch/powerpc/platforms/pseries/smp.c

reviewed

··· 44 44 #include <asm/mpic.h> 45 45 #include <asm/vdso_datapage.h> 46 46 #include <asm/cputhreads.h> 47 47 - #include <asm/mpic.h> 48 47 #include <asm/xics.h> 49 48 50 49 #include "plpar_wrappers.h"

-1

arch/s390/kvm/sie64a.S

reviewed

··· 14 14 #include <linux/errno.h> 15 15 #include <asm/asm-offsets.h> 16 16 #include <asm/setup.h> 17 17 - #include <asm/asm-offsets.h> 18 17 #include <asm/ptrace.h> 19 18 #include <asm/thread_info.h> 20 19

-2

arch/s390/oprofile/init.c

reviewed

··· 13 13 #include <linux/oprofile.h> 14 14 #include <linux/init.h> 15 15 #include <linux/errno.h> 16 16 - #include <linux/oprofile.h> 17 17 - #include <linux/errno.h> 18 16 #include <linux/fs.h> 19 17 20 18 #include "../../../drivers/oprofile/oprof.h"

-1

arch/x86/kvm/mmu.c

reviewed

··· 22 22 #include "mmu.h" 23 23 #include "x86.h" 24 24 #include "kvm_cache_regs.h" 25 25 - #include "x86.h" 26 25 27 26 #include <linux/kvm_host.h> 28 27 #include <linux/types.h>

+1 -2

arch/xtensa/include/asm/uaccess.h

reviewed

··· 17 17 #define _XTENSA_UACCESS_H 18 18 19 19 #include <linux/errno.h> 20 20 + #include <asm/types.h> 20 21 21 22 #define VERIFY_READ 0 22 23 #define VERIFY_WRITE 1 ··· 27 26 #include <asm/current.h> 28 27 #include <asm/asm-offsets.h> 29 28 #include <asm/processor.h> 30 30 - #include <asm/types.h> 31 29 32 30 /* 33 31 * These assembly macros mirror the C macros that follow below. They ··· 157 157 #else /* __ASSEMBLY__ not defined */ 158 158 159 159 #include <linux/sched.h> 160 160 - #include <asm/types.h> 161 160 162 161 /* 163 162 * The fs value determines whether argument validity checking should

-1

drivers/gpio/ab8500-gpio.c

reviewed

··· 15 15 #include <linux/module.h> 16 16 #include <linux/err.h> 17 17 #include <linux/platform_device.h> 18 18 - #include <linux/slab.h> 19 18 #include <linux/gpio.h> 20 19 #include <linux/irq.h> 21 20 #include <linux/interrupt.h>

-1

drivers/gpu/drm/nouveau/nv50_graph.c

reviewed

··· 31 31 #include "nouveau_grctx.h" 32 32 #include "nouveau_dma.h" 33 33 #include "nouveau_vm.h" 34 34 - #include "nouveau_ramht.h" 35 34 #include "nv50_evo.h" 36 35 37 36 struct nv50_graph_engine {

-1

drivers/media/rc/ite-cir.c

reviewed

··· 42 42 #include <linux/bitops.h> 43 43 #include <media/rc-core.h> 44 44 #include <linux/pci_ids.h> 45 45 - #include <linux/delay.h> 46 45 47 46 #include "ite-cir.h" 48 47

-1

drivers/media/video/m5mols/m5mols_capture.c

reviewed

··· 22 22 #include <linux/gpio.h> 23 23 #include <linux/regulator/consumer.h> 24 24 #include <linux/videodev2.h> 25 25 - #include <linux/version.h> 26 25 #include <media/v4l2-ctrls.h> 27 26 #include <media/v4l2-device.h> 28 27 #include <media/v4l2-subdev.h>

-1

drivers/media/video/videobuf2-memops.c

reviewed

··· 18 18 #include <linux/mm.h> 19 19 #include <linux/sched.h> 20 20 #include <linux/file.h> 21 21 - #include <linux/slab.h> 22 21 23 22 #include <media/videobuf2-core.h> 24 23 #include <media/videobuf2-memops.h>

-1

drivers/net/can/c_can/c_can.c

reviewed

··· 34 34 #include <linux/if_arp.h> 35 35 #include <linux/if_ether.h> 36 36 #include <linux/list.h> 37 37 - #include <linux/delay.h> 38 37 #include <linux/io.h> 39 38 40 39 #include <linux/can.h>

-1

drivers/net/can/c_can/c_can_platform.c

reviewed

··· 28 28 #include <linux/if_arp.h> 29 29 #include <linux/if_ether.h> 30 30 #include <linux/list.h> 31 31 - #include <linux/delay.h> 32 31 #include <linux/io.h> 33 32 #include <linux/platform_device.h> 34 33 #include <linux/clk.h>

+1 -2

drivers/net/sungem.c

reviewed

··· 66 66 #include <asm/byteorder.h> 67 67 #include <asm/uaccess.h> 68 68 #include <asm/irq.h> 69 69 + #include <asm/prom.h> 69 70 70 71 #ifdef CONFIG_SPARC 71 72 #include <asm/idprom.h> 72 72 - #include <asm/prom.h> 73 73 #endif 74 74 75 75 #ifdef CONFIG_PPC_PMAC 76 76 #include <asm/pci-bridge.h> 77 77 - #include <asm/prom.h> 78 77 #include <asm/machdep.h> 79 78 #include <asm/pmac_feature.h> 80 79 #endif

-1

drivers/net/wireless/ath/ath5k/ahb.c

reviewed

··· 24 24 #include "debug.h" 25 25 #include "base.h" 26 26 #include "reg.h" 27 27 - #include "debug.h" 28 27 29 28 /* return bus cachesize in 4B word units */ 30 29 static void ath5k_ahb_read_cachesize(struct ath_common *common, int *csz)

-1

drivers/staging/ath6kl/os/linux/include/ar6000_drv.h

reviewed

··· 52 52 #include "aggr_recv_api.h" 53 53 #include <host_version.h> 54 54 #include <linux/rtnetlink.h> 55 55 - #include <linux/init.h> 56 55 #include <linux/moduleparam.h> 57 56 #include "ar6000_api.h" 58 57 #ifdef CONFIG_HOST_TCMD_SUPPORT

+2 -5

drivers/staging/bcm/headers.h

reviewed

··· 20 20 #include <linux/file.h> 21 21 #include <linux/string.h> 22 22 #include <linux/etherdevice.h> 23 23 - #include <net/ip.h> 24 23 #include <linux/wait.h> 25 24 #include <linux/proc_fs.h> 26 25 #include <linux/interrupt.h> 27 27 - 28 26 #include <linux/version.h> 29 27 #include <linux/stddef.h> 30 30 - #include <linux/kernel.h> 31 28 #include <linux/stat.h> 32 29 #include <linux/fcntl.h> 33 30 #include <linux/unistd.h> 34 31 #include <linux/sched.h> 35 32 #include <linux/mm.h> 36 33 #include <linux/pagemap.h> 37 37 - #include <asm/uaccess.h> 38 34 #include <linux/kthread.h> 39 35 #include <linux/tcp.h> 40 36 #include <linux/udp.h> 41 37 #include <linux/usb.h> 38 38 + #include <asm/uaccess.h> 39 39 + #include <net/ip.h> 42 40 43 41 #include "Typedefs.h" 44 42 #include "Version.h" ··· 58 60 #include "Prototypes.h" 59 61 #include "Queue.h" 60 62 #include "vendorspecificextn.h" 61 61 - 62 63 63 64 #include "InterfaceMacros.h" 64 65 #include "InterfaceAdapter.h"

-1

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

reviewed

··· 26 26 #include BCMEMBEDIMAGE 27 27 #endif /* BCMEMBEDIMAGE */ 28 28 29 29 - #include <bcmdefs.h> 30 29 #include <bcmutils.h> 31 30 #include <bcmdevs.h> 32 31

-1

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h

reviewed

··· 18 18 #define _wl_cfg80211_h_ 19 19 20 20 #include <linux/wireless.h> 21 21 - #include <linux/wireless.h> 22 21 #include <net/cfg80211.h> 23 22 #include <wlioctl.h> 24 23

+2 -7

drivers/staging/brcm80211/brcmfmac/wl_iw.c

reviewed

··· 19 19 #include <bcmdefs.h> 20 20 #include <linux/netdevice.h> 21 21 #include <wlioctl.h> 22 22 - 23 22 #include <bcmutils.h> 24 24 - 25 23 #include <linux/if_arp.h> 26 24 #include <asm/uaccess.h> 25 25 + #include <linux/ieee80211.h> 27 26 28 27 #include <dngl_stats.h> 29 28 #include <dhd.h> 30 29 #include <dhdioctl.h> 31 31 - #include <linux/ieee80211.h> 32 32 - typedef const struct si_pub si_t; 33 33 - #include <wlioctl.h> 34 30 35 35 - #include <dngl_stats.h> 36 36 - #include <dhd.h> 31 31 + typedef const struct si_pub si_t; 37 32 38 33 #define WL_ERROR(fmt, args...) printk(fmt, ##args) 39 34 #define WL_TRACE(fmt, args...) no_printk(fmt, ##args)

-1

drivers/staging/gma500/psb_2d.c

reviewed

··· 38 38 39 39 #include "psb_drv.h" 40 40 #include "psb_reg.h" 41 41 - #include "psb_drv.h" 42 41 #include "psb_fb.h" 43 42 44 43 void psb_spank(struct drm_psb_private *dev_priv)

-1

drivers/staging/hv/hv_mouse.c

reviewed

··· 24 24 #include <linux/hiddev.h> 25 25 #include <linux/pci.h> 26 26 #include <linux/dmi.h> 27 27 - #include <linux/delay.h> 28 27 29 28 #include "hyperv.h" 30 29

-1

drivers/staging/hv/tools/hv_kvp_daemon.c

reviewed

··· 35 35 #include <arpa/inet.h> 36 36 #include <linux/connector.h> 37 37 #include <linux/netlink.h> 38 38 - #include <sys/socket.h> 39 38 #include <ifaddrs.h> 40 39 #include <netdb.h> 41 40 #include <syslog.h>

-1

drivers/staging/nvec/nvec.c

reviewed

··· 21 21 #include <linux/semaphore.h> 22 22 #include <linux/list.h> 23 23 #include <linux/notifier.h> 24 24 - #include <linux/workqueue.h> 25 24 #include <linux/platform_device.h> 26 25 #include "nvec.h" 27 26

-1

drivers/staging/rtl8712/drv_types.h

reviewed

··· 29 29 30 30 #include "rtl871x_ht.h" 31 31 #include "rtl871x_cmd.h" 32 32 - #include "wlan_bssdef.h" 33 32 #include "rtl871x_xmit.h" 34 33 #include "rtl871x_recv.h" 35 34 #include "rtl871x_security.h"

-1

drivers/staging/rtl8712/osdep_service.h

reviewed

··· 22 22 #include <linux/module.h> 23 23 #include <linux/sched.h> 24 24 #include <linux/kref.h> 25 25 - #include <linux/netdevice.h> 26 25 #include <linux/skbuff.h> 27 26 #include <linux/usb.h> 28 27 #include <linux/usb/ch9.h>

-1

drivers/staging/sep/sep_driver.c

reviewed

··· 50 50 #include <linux/interrupt.h> 51 51 #include <linux/pagemap.h> 52 52 #include <asm/cacheflush.h> 53 53 - #include <linux/sched.h> 54 53 #include <linux/delay.h> 55 54 #include <linux/jiffies.h> 56 55 #include <linux/rar_register.h>

-1

drivers/staging/usbip/userspace/src/utils.h

reviewed

··· 13 13 #include <glib.h> 14 14 #include <unistd.h> 15 15 #include <stdio.h> 16 16 - #include <sys/types.h> 17 16 #include <sys/stat.h> 18 17 #include <fcntl.h> 19 18 #include <stdlib.h>

+1 -1

drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h

reviewed

··· 315 315 /* moved to staging location 316 316 #include <linux/westbridge/cyas_cplus_end.h> 317 317 */ 318 318 - #include "../../../../../../../include/linux/westbridge/cyas_cplus_start.h" 318 318 + #include "../../../../../../../include/linux/westbridge/cyas_cplus_end.h" 319 319 #endif

+2 -6

drivers/staging/westbridge/astoria/gadget/cyasgadget.h

reviewed

··· 54 54 #include <linux/usb/ch9.h> 55 55 #include <linux/usb/gadget.h> 56 56 #include <linux/sched.h> 57 57 + #include <linux/module.h> 58 58 + #include <linux/init.h> 57 59 58 60 #include "../include/linux/westbridge/cyastoria.h" 59 61 #include "../include/linux/westbridge/cyashal.h" 60 62 #include "../include/linux/westbridge/cyasdevice.h" 61 63 #include "cyasgadget_ioctl.h" 62 64 63 63 - #include <linux/module.h> 64 64 - #include <linux/init.h> 65 65 - 66 65 /*char driver defines, revisit*/ 67 67 - #include <linux/module.h> 68 68 - #include <linux/moduleparam.h> 69 69 - #include <linux/init.h> 70 66 #include <linux/fs.h> /* everything... */ 71 67 #include <linux/errno.h> /* error codes */ 72 68 #include <linux/types.h> /* size_t */

-1

drivers/target/loopback/tcm_loop.c

reviewed

··· 31 31 #include <scsi/scsi_host.h> 32 32 #include <scsi/scsi_device.h> 33 33 #include <scsi/scsi_cmnd.h> 34 34 - #include <scsi/scsi_tcq.h> 35 34 36 35 #include <target/target_core_base.h> 37 36 #include <target/target_core_transport.h>

-1

drivers/target/tcm_fc/tfc_cmd.c

reviewed

··· 45 45 #include <target/target_core_device.h> 46 46 #include <target/target_core_tpg.h> 47 47 #include <target/target_core_configfs.h> 48 48 - #include <target/target_core_base.h> 49 48 #include <target/target_core_tmr.h> 50 49 #include <target/configfs_macros.h> 51 50

-1

drivers/target/tcm_fc/tfc_conf.c

reviewed

··· 48 48 #include <target/target_core_device.h> 49 49 #include <target/target_core_tpg.h> 50 50 #include <target/target_core_configfs.h> 51 51 - #include <target/target_core_base.h> 52 51 #include <target/configfs_macros.h> 53 52 54 53 #include "tcm_fc.h"

-1

drivers/target/tcm_fc/tfc_io.c

reviewed

··· 53 53 #include <target/target_core_device.h> 54 54 #include <target/target_core_tpg.h> 55 55 #include <target/target_core_configfs.h> 56 56 - #include <target/target_core_base.h> 57 56 #include <target/configfs_macros.h> 58 57 59 58 #include "tcm_fc.h"

-2

drivers/target/tcm_fc/tfc_sess.c

reviewed

··· 46 46 #include <target/target_core_device.h> 47 47 #include <target/target_core_tpg.h> 48 48 #include <target/target_core_configfs.h> 49 49 - #include <target/target_core_base.h> 50 49 #include <target/configfs_macros.h> 51 50 52 52 - #include <scsi/libfc.h> 53 51 #include "tcm_fc.h" 54 52 55 53 static void ft_sess_delete_all(struct ft_tport *);

-1

drivers/usb/otg/otg_fsm.c

reviewed

··· 28 28 #include <linux/usb.h> 29 29 #include <linux/usb/gadget.h> 30 30 #include <linux/usb/otg.h> 31 31 - #include <linux/types.h> 32 31 33 32 #include "otg_fsm.h" 34 33

-1

drivers/video/udlfb.c

reviewed

··· 29 29 #include <linux/slab.h> 30 30 #include <linux/prefetch.h> 31 31 #include <linux/delay.h> 32 32 - #include <linux/prefetch.h> 33 32 #include <video/udlfb.h> 34 33 #include "edid.h" 35 34

-1

drivers/watchdog/intel_scu_watchdog.c

reviewed

··· 42 42 #include <linux/sched.h> 43 43 #include <linux/signal.h> 44 44 #include <linux/sfi.h> 45 45 - #include <linux/types.h> 46 45 #include <asm/irq.h> 47 46 #include <asm/atomic.h> 48 47 #include <asm/intel_scu_ipc.h>

+2 -5

fs/nfs/idmap.c

reviewed

··· 36 36 #include <linux/types.h> 37 37 #include <linux/string.h> 38 38 #include <linux/kernel.h> 39 39 + #include <linux/slab.h> 40 40 + #include <linux/nfs_idmap.h> 39 41 40 42 static int nfs_map_string_to_numeric(const char *name, size_t namelen, __u32 *res) 41 43 { ··· 61 59 62 60 #ifdef CONFIG_NFS_USE_NEW_IDMAPPER 63 61 64 64 - #include <linux/slab.h> 65 62 #include <linux/cred.h> 66 63 #include <linux/sunrpc/sched.h> 67 64 #include <linux/nfs4.h> 68 65 #include <linux/nfs_fs_sb.h> 69 69 - #include <linux/nfs_idmap.h> 70 66 #include <linux/keyctl.h> 71 67 #include <linux/key-type.h> 72 68 #include <linux/rcupdate.h> ··· 284 284 #include <linux/module.h> 285 285 #include <linux/mutex.h> 286 286 #include <linux/init.h> 287 287 - #include <linux/slab.h> 288 287 #include <linux/socket.h> 289 288 #include <linux/in.h> 290 289 #include <linux/sched.h> 291 291 - 292 290 #include <linux/sunrpc/clnt.h> 293 291 #include <linux/workqueue.h> 294 292 #include <linux/sunrpc/rpc_pipe_fs.h> 295 293 296 294 #include <linux/nfs_fs.h> 297 295 298 298 - #include <linux/nfs_idmap.h> 299 296 #include "nfs4_fs.h" 300 297 301 298 #define IDMAP_HASH_SZ 128

-1

fs/ocfs2/move_extents.c

reviewed

··· 36 36 #include "dir.h" 37 37 #include "buffer_head_io.h" 38 38 #include "sysfile.h" 39 39 - #include "suballoc.h" 40 39 #include "refcounttree.h" 41 40 #include "move_extents.h" 42 41

-1

include/linux/fs.h

reviewed

··· 376 376 377 377 #include <linux/linkage.h> 378 378 #include <linux/wait.h> 379 379 - #include <linux/types.h> 380 379 #include <linux/kdev_t.h> 381 380 #include <linux/dcache.h> 382 381 #include <linux/path.h>

-1

net/ipv4/ping.c

reviewed

··· 41 41 #include <linux/proc_fs.h> 42 42 #include <net/sock.h> 43 43 #include <net/ping.h> 44 44 - #include <net/icmp.h> 45 44 #include <net/udp.h> 46 45 #include <net/route.h> 47 46 #include <net/inet_common.h>