Headers duplication corrections based on checkincludes script output.
Subsystems (30)
PATCH 1/1 Headers duplication corrections based on checkincludes script output.
From: Vitaliy Ivanov <[email protected]>
Many stupid corrections of duplicated headers based on the output of scripts/checkincludes.pl.
Signed-off-by Vitaliy Ivanov <[email protected]>
Quoted 1 line
From
c2553ee8d64e52e1fb86fa95ffbaec5af1627077Mon Sep 17 00:00:00 2001
From: Vitaliy Ivanov <[email protected]>
Date: Wed, 15 Jun 2011 21:01:43 +0300
Subject: [PATCH] Headers duplication corrections based on checkincludes script output.
--- arch/arm/mach-dove/common.c | 1 - arch/arm/mach-s3c2410/h1940-bluetooth.c | 1 - arch/mips/lantiq/devices.c | 2 -- arch/mips/lantiq/xway/devices.c | 2 -- arch/powerpc/platforms/pseries/smp.c | 1 - arch/s390/kvm/sie64a.S | 1 - arch/s390/oprofile/init.c | 2 -- arch/x86/kvm/mmu.c | 1 - arch/xtensa/include/asm/uaccess.h | 3 +-- drivers/gpio/ab8500-gpio.c | 1 - drivers/gpu/drm/nouveau/nv50_graph.c | 1 - drivers/media/rc/ite-cir.c | 1 - drivers/media/video/m5mols/m5mols_capture.c | 1 - drivers/media/video/videobuf2-memops.c | 1 - drivers/net/can/c_can/c_can.c | 1 - drivers/net/can/c_can/c_can_platform.c | 1 - drivers/net/sungem.c | 3 +-- drivers/net/wireless/ath/ath5k/ahb.c | 1 - .../staging/ath6kl/os/linux/include/ar6000_drv.h | 1 - drivers/staging/bcm/headers.h | 7 ++----- drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 1 - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 1 - drivers/staging/brcm80211/brcmfmac/wl_iw.c | 9 ++------- drivers/staging/gma500/psb_2d.c | 1 - drivers/staging/hv/hv_mouse.c | 1 - drivers/staging/hv/tools/hv_kvp_daemon.c | 1 - drivers/staging/nvec/nvec.c | 1 - drivers/staging/rtl8712/drv_types.h | 1 - drivers/staging/rtl8712/osdep_service.h | 1 - drivers/staging/sep/sep_driver.c | 1 - drivers/staging/usbip/userspace/src/utils.h | 1 - .../cyashalomap_kernel.h | 2 +- .../staging/westbridge/astoria/gadget/cyasgadget.h | 8 ++------ drivers/target/loopback/tcm_loop.c | 1 - drivers/target/tcm_fc/tfc_cmd.c | 1 - drivers/target/tcm_fc/tfc_conf.c | 1 - drivers/target/tcm_fc/tfc_io.c | 1 - drivers/target/tcm_fc/tfc_sess.c | 2 -- drivers/usb/otg/otg_fsm.c | 1 - drivers/video/udlfb.c | 1 - drivers/watchdog/intel_scu_watchdog.c | 1 - fs/nfs/idmap.c | 7 ++----- fs/ocfs2/move_extents.c | 1 - include/linux/fs.h | 1 - net/ipv4/ping.c | 1 - 45 files changed, 11 insertions(+), 70 deletions(-)
arch/arm/mach-dove/common.c +0 -1
@@ -17,7 +17,6 @@#include <linux/clk.h> #include <linux/mbus.h> #include <linux/ata_platform.h> -#include <linux/serial_8250.h> #include <linux/gpio.h> #include <asm/page.h> #include <asm/setup.h>
arch/arm/mach-s3c2410/h1940-bluetooth.c +0 -1
@@ -18,7 +18,6 @@#include <linux/leds.h> #include <linux/gpio.h> #include <linux/rfkill.h> -#include <linux/leds.h> #include <mach/regs-gpio.h> #include <mach/hardware.h>
arch/mips/lantiq/devices.c +0 -2
@@ -15,11 +15,9 @@#include <linux/platform_device.h> #include <linux/leds.h> #include <linux/etherdevice.h> -#include <linux/reboot.h> #include <linux/time.h> #include <linux/io.h> #include <linux/gpio.h> -#include <linux/leds.h> #include <asm/bootinfo.h> #include <asm/irq.h>
arch/mips/lantiq/xway/devices.c +0 -2
@@ -16,11 +16,9 @@#include <linux/platform_device.h> #include <linux/leds.h> #include <linux/etherdevice.h> -#include <linux/reboot.h> #include <linux/time.h> #include <linux/io.h> #include <linux/gpio.h> -#include <linux/leds.h> #include <asm/bootinfo.h> #include <asm/irq.h>
arch/powerpc/platforms/pseries/smp.c +0 -1
@@ -44,7 +44,6 @@#include <asm/mpic.h> #include <asm/vdso_datapage.h> #include <asm/cputhreads.h> -#include <asm/mpic.h> #include <asm/xics.h> #include "plpar_wrappers.h"
arch/s390/kvm/sie64a.S +0 -1
@@ -14,7 +14,6 @@ #include <linux/errno.h> #include <asm/asm-offsets.h> #include <asm/setup.h> -#include <asm/asm-offsets.h> #include <asm/ptrace.h> #include <asm/thread_info.h>
arch/s390/oprofile/init.c +0 -2
@@ -13,8 +13,6 @@#include <linux/oprofile.h> #include <linux/init.h> #include <linux/errno.h> -#include <linux/oprofile.h> -#include <linux/errno.h> #include <linux/fs.h> #include "../../../drivers/oprofile/oprof.h"
arch/x86/kvm/mmu.c +0 -1
@@ -22,7 +22,6 @@#include "mmu.h" #include "x86.h" #include "kvm_cache_regs.h" -#include "x86.h" #include <linux/kvm_host.h> #include <linux/types.h>
arch/xtensa/include/asm/uaccess.h +1 -2
@@ -17,6 +17,7 @@#define _XTENSA_UACCESS_H#include <linux/errno.h> +#include <asm/types.h> #define VERIFY_READ 0#define VERIFY_WRITE 1
@@ -26,7 +27,6 @@#include <asm/current.h> #include <asm/asm-offsets.h> #include <asm/processor.h> -#include <asm/types.h> /* * These assembly macros mirror the C macros that follow below. They
@@ -157,7 +157,6 @@#else /* __ASSEMBLY__ not defined */ #include <linux/sched.h> -#include <asm/types.h> /* * The fs value determines whether argument validity checking should
drivers/gpio/ab8500-gpio.c +0 -1
@@ -15,7 +15,6 @@#include <linux/module.h> #include <linux/err.h> #include <linux/platform_device.h> -#include <linux/slab.h> #include <linux/gpio.h> #include <linux/irq.h> #include <linux/interrupt.h>
drivers/gpu/drm/nouveau/nv50_graph.c +0 -1
@@ -31,7 +31,6 @@#include "nouveau_grctx.h" #include "nouveau_dma.h" #include "nouveau_vm.h" -#include "nouveau_ramht.h" #include "nv50_evo.h" struct nv50_graph_engine {
drivers/media/rc/ite-cir.c +0 -1
@@ -42,7 +42,6 @@#include <linux/bitops.h> #include <media/rc-core.h> #include <linux/pci_ids.h> -#include <linux/delay.h> #include "ite-cir.h"
drivers/media/video/m5mols/m5mols_capture.c +0 -1
@@ -22,7 +22,6 @@#include <linux/gpio.h> #include <linux/regulator/consumer.h> #include <linux/videodev2.h> -#include <linux/version.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> #include <media/v4l2-subdev.h>
drivers/media/video/videobuf2-memops.c +0 -1
@@ -18,7 +18,6 @@#include <linux/mm.h> #include <linux/sched.h> #include <linux/file.h> -#include <linux/slab.h> #include <media/videobuf2-core.h> #include <media/videobuf2-memops.h>
drivers/net/can/c_can/c_can.c +0 -1
@@ -34,7 +34,6 @@#include <linux/if_arp.h> #include <linux/if_ether.h> #include <linux/list.h> -#include <linux/delay.h> #include <linux/io.h> #include <linux/can.h>
drivers/net/can/c_can/c_can_platform.c +0 -1
@@ -28,7 +28,6 @@#include <linux/if_arp.h> #include <linux/if_ether.h> #include <linux/list.h> -#include <linux/delay.h> #include <linux/io.h> #include <linux/platform_device.h> #include <linux/clk.h>
drivers/net/sungem.c +1 -2
@@ -66,15 +66,14 @@#include <asm/byteorder.h> #include <asm/uaccess.h> #include <asm/irq.h> +#include <asm/prom.h> #ifdef CONFIG_SPARC #include <asm/idprom.h> -#include <asm/prom.h> #endif #ifdef CONFIG_PPC_PMAC #include <asm/pci-bridge.h> -#include <asm/prom.h> #include <asm/machdep.h> #include <asm/pmac_feature.h> #endif
drivers/net/wireless/ath/ath5k/ahb.c +0 -1
@@ -24,7 +24,6 @@#include "debug.h" #include "base.h" #include "reg.h" -#include "debug.h" /* return bus cachesize in 4B word units */ static void ath5k_ahb_read_cachesize (struct ath_common *common,int *csz)
drivers/staging/ath6kl/os/linux/include/ar6000_drv.h +0 -1
@@ -52,7 +52,6 @@#include "aggr_recv_api.h" #include <host_version.h> #include <linux/rtnetlink.h> -#include <linux/init.h> #include <linux/moduleparam.h> #include "ar6000_api.h" #ifdef CONFIG_HOST_TCMD_SUPPORT
drivers/staging/bcm/headers.h +2 -5
@@ -20,25 +20,23 @@#include <linux/file.h> #include <linux/string.h> #include <linux/etherdevice.h> -#include <net/ip.h> #include <linux/wait.h> #include <linux/proc_fs.h> #include <linux/interrupt.h> -#include <linux/version.h> #include <linux/stddef.h> -#include <linux/kernel.h> #include <linux/stat.h> #include <linux/fcntl.h> #include <linux/unistd.h> #include <linux/sched.h> #include <linux/mm.h> #include <linux/pagemap.h> -#include <asm/uaccess.h> #include <linux/kthread.h> #include <linux/tcp.h> #include <linux/udp.h> #include <linux/usb.h> +#include <asm/uaccess.h> +#include <net/ip.h> #include "Typedefs.h" #include "Version.h"
@@ -61,7 +59,6 @@#include "Queue.h" #include "vendorspecificextn.h" -#include "InterfaceMacros.h" #include "InterfaceAdapter.h" #include "InterfaceIsr.h"
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +0 -1
@@ -26,7 +26,6 @@#include BCMEMBEDIMAGE #endif /* BCMEMBEDIMAGE */ -#include <bcmdefs.h> #include <bcmutils.h> #include <bcmdevs.h>
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h +0 -1
@@ -18,7 +18,6 @@#define _wl_cfg80211_h_#include <linux/wireless.h> -#include <linux/wireless.h> #include <net/cfg80211.h> #include <wlioctl.h>
drivers/staging/brcm80211/brcmfmac/wl_iw.c +2 -7
@@ -19,21 +19,16 @@#include <bcmdefs.h> #include <linux/netdevice.h> #include <wlioctl.h> -#include <bcmutils.h> -#include <linux/if_arp.h> #include <asm/uaccess.h> +#include <linux/ieee80211.h> #include <dngl_stats.h> #include <dhd.h> #include <dhdioctl.h> -#include <linux/ieee80211.h> -typedef const struct si_pub si_t ; -#include <wlioctl.h> -#include <dngl_stats.h> -#include <dhd.h> +typedef const struct si_pub si_t ; #define WL_ERROR(fmt, args...) printk(fmt, ##args) #define WL_TRACE(fmt, args...) no_printk(fmt, ##args)
drivers/staging/gma500/psb_2d.c +0 -1
@@ -38,7 +38,6 @@#include "psb_drv.h" #include "psb_reg.h" -#include "psb_drv.h" #include "psb_fb.h" void psb_spank (struct drm_psb_private *dev_priv)
drivers/staging/hv/hv_mouse.c +0 -1
@@ -24,7 +24,6 @@#include <linux/hiddev.h> #include <linux/pci.h> #include <linux/dmi.h> -#include <linux/delay.h> #include "hyperv.h"
drivers/staging/hv/tools/hv_kvp_daemon.c +0 -1
@@ -35,7 +35,6 @@#include <arpa/inet.h> #include <linux/connector.h> #include <linux/netlink.h> -#include <sys/socket.h> #include <ifaddrs.h> #include <netdb.h> #include <syslog.h>
drivers/staging/nvec/nvec.c +0 -1
@@ -21,7 +21,6 @@#include <linux/semaphore.h> #include <linux/list.h> #include <linux/notifier.h> -#include <linux/workqueue.h> #include <linux/platform_device.h> #include "nvec.h"
drivers/staging/rtl8712/drv_types.h +0 -1
@@ -29,7 +29,6 @@ struct qos_priv {#include "rtl871x_ht.h" #include "rtl871x_cmd.h" -#include "wlan_bssdef.h" #include "rtl871x_xmit.h" #include "rtl871x_recv.h" #include "rtl871x_security.h"
drivers/staging/rtl8712/osdep_service.h +0 -1
@@ -22,7 +22,6 @@#include <linux/module.h> #include <linux/sched.h> #include <linux/kref.h> -#include <linux/netdevice.h> #include <linux/skbuff.h> #include <linux/usb.h> #include <linux/usb/ch9.h>
drivers/staging/sep/sep_driver.c +0 -1
@@ -50,7 +50,6 @@#include <linux/interrupt.h> #include <linux/pagemap.h> #include <asm/cacheflush.h> -#include <linux/sched.h> #include <linux/delay.h> #include <linux/jiffies.h> #include <linux/rar_register.h>
drivers/staging/usbip/userspace/src/utils.h +0 -1
@@ -13,7 +13,6 @@#include <glib.h> #include <unistd.h> #include <stdio.h> -#include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <stdlib.h>
drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h +1 -1
@@ -315,5 +315,5 @@ void cy_as_hal_set_ep_dma_mode(uint8_t ep, bool sg_xfer_enabled);/* moved to staging location #include <linux/westbridge/cyas_cplus_end.h> */ -#include "../../../../../../../include/linux/westbridge/cyas_cplus_start.h" +#include "../../../../../../../include/linux/westbridge/cyas_cplus_end.h" #endif
drivers/staging/westbridge/astoria/gadget/cyasgadget.h +2 -6
@@ -54,19 +54,15 @@#include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/sched.h> +#include <linux/module.h> +#include <linux/init.h> #include "../include/linux/westbridge/cyastoria.h" #include "../include/linux/westbridge/cyashal.h" #include "../include/linux/westbridge/cyasdevice.h" #include "cyasgadget_ioctl.h" -#include <linux/module.h> -#include <linux/init.h> -/*char driver defines, revisit*/ -#include <linux/module.h> -#include <linux/moduleparam.h> -#include <linux/init.h> #include <linux/fs.h> /* everything... */ #include <linux/errno.h> /* error codes */ #include <linux/types.h> /* size_t */
drivers/target/loopback/tcm_loop.c +0 -1
@@ -31,7 +31,6 @@#include <scsi/scsi_host.h> #include <scsi/scsi_device.h> #include <scsi/scsi_cmnd.h> -#include <scsi/scsi_tcq.h> #include <target/target_core_base.h> #include <target/target_core_transport.h>
drivers/target/tcm_fc/tfc_cmd.c +0 -1
@@ -45,7 +45,6 @@#include <target/target_core_device.h> #include <target/target_core_tpg.h> #include <target/target_core_configfs.h> -#include <target/target_core_base.h> #include <target/target_core_tmr.h> #include <target/configfs_macros.h>
drivers/target/tcm_fc/tfc_conf.c +0 -1
@@ -48,7 +48,6 @@#include <target/target_core_device.h> #include <target/target_core_tpg.h> #include <target/target_core_configfs.h> -#include <target/target_core_base.h> #include <target/configfs_macros.h> #include "tcm_fc.h"
drivers/target/tcm_fc/tfc_io.c +0 -1
@@ -53,7 +53,6 @@#include <target/target_core_device.h> #include <target/target_core_tpg.h> #include <target/target_core_configfs.h> -#include <target/target_core_base.h> #include <target/configfs_macros.h> #include "tcm_fc.h"
drivers/target/tcm_fc/tfc_sess.c +0 -2
@@ -46,10 +46,8 @@#include <target/target_core_device.h> #include <target/target_core_tpg.h> #include <target/target_core_configfs.h> -#include <target/target_core_base.h> #include <target/configfs_macros.h> -#include <scsi/libfc.h> #include "tcm_fc.h" static void ft_sess_delete_all (struct ft_tport *);
drivers/usb/otg/otg_fsm.c +0 -1
@@ -28,7 +28,6 @@#include <linux/usb.h> #include <linux/usb/gadget.h> #include <linux/usb/otg.h> -#include <linux/types.h> #include "otg_fsm.h"
drivers/video/udlfb.c +0 -1
@@ -29,7 +29,6 @@#include <linux/slab.h> #include <linux/prefetch.h> #include <linux/delay.h> -#include <linux/prefetch.h> #include <video/udlfb.h> #include "edid.h"
drivers/watchdog/intel_scu_watchdog.c +0 -1
@@ -42,7 +42,6 @@#include <linux/sched.h> #include <linux/signal.h> #include <linux/sfi.h> -#include <linux/types.h> #include <asm/irq.h> #include <asm/atomic.h> #include <asm/intel_scu_ipc.h>
fs/nfs/idmap.c +2 -5
@@ -36,6 +36,8 @@#include <linux/types.h> #include <linux/string.h> #include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/nfs_idmap.h> static int nfs_map_string_to_numeric (const char *name,size_t namelen,__u32 *res) {
@@ -59,12 +61,10 @@ static int nfs_map_numeric_to_string(__u32 id, char *buf, size_t buflen)#ifdef CONFIG_NFS_USE_NEW_IDMAPPER -#include <linux/slab.h> #include <linux/cred.h> #include <linux/sunrpc/sched.h> #include <linux/nfs4.h> #include <linux/nfs_fs_sb.h> -#include <linux/nfs_idmap.h> #include <linux/keyctl.h> #include <linux/key-type.h> #include <linux/rcupdate.h>
@@ -284,18 +284,15 @@ int nfs_map_gid_to_group(const struct nfs_server *server, __u32 gid, char *buf,#include <linux/module.h> #include <linux/mutex.h> #include <linux/init.h> -#include <linux/slab.h> #include <linux/socket.h> #include <linux/in.h> #include <linux/sched.h> -#include <linux/sunrpc/clnt.h> #include <linux/workqueue.h> #include <linux/sunrpc/rpc_pipe_fs.h> #include <linux/nfs_fs.h> -#include <linux/nfs_idmap.h> #include "nfs4_fs.h" #define IDMAP_HASH_SZ 128
fs/ocfs2/move_extents.c +0 -1
@@ -36,7 +36,6 @@#include "dir.h" #include "buffer_head_io.h" #include "sysfile.h" -#include "suballoc.h" #include "refcounttree.h" #include "move_extents.h"
include/linux/fs.h +0 -1
@@ -376,7 +376,6 @@ struct inodes_stat_t {#include <linux/linkage.h> #include <linux/wait.h> -#include <linux/types.h> #include <linux/kdev_t.h> #include <linux/dcache.h> #include <linux/path.h>
net/ipv4/ping.c +0 -1
@@ -41,7 +41,6 @@#include <linux/proc_fs.h> #include <net/sock.h> #include <net/ping.h> -#include <net/icmp.h> #include <net/udp.h> #include <net/route.h> #include <net/inet_common.h>
Signature · 1 line
1.7.0.4