From afafd7234723f3c15387cbe39ba6380b94c388d0 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Sat, 6 Sep 2003 00:34:01 -0700 Subject: [PATCH] [PATCH] janitor: remove unneeded version.h #includes From: Randy Hron remove unneeded linux/version.h usage & some duplicate #includes; --- drivers/atm/fore200e.c | 1 - drivers/atm/horizon.h | 1 - drivers/atm/iphase.c | 1 - drivers/block/DAC960.c | 1 - drivers/block/cciss.c | 1 - drivers/bluetooth/hci_bcsp.c | 1 - drivers/bluetooth/hci_h4.c | 1 - drivers/bluetooth/hci_ldisc.c | 1 - drivers/bluetooth/hci_usb.c | 1 - drivers/char/mwave/3780i.c | 1 - drivers/char/mwave/mwavedd.c | 1 - drivers/char/mwave/smapi.c | 1 - drivers/char/n_hdlc.c | 1 - drivers/char/sx.c | 1 - drivers/char/synclink.c | 1 - drivers/char/synclinkmp.c | 1 - drivers/char/vt.c | 1 - drivers/ieee1394/ieee1394_types.h | 1 - drivers/ieee1394/nodemgr.c | 1 - drivers/ieee1394/ohci1394.h | 2 -- drivers/ieee1394/raw1394.c | 1 - drivers/ieee1394/sbp2.c | 3 --- drivers/ieee1394/video1394.c | 1 - drivers/message/fusion/mptscsih.c | 1 - drivers/message/fusion/mptscsih.h | 3 --- fs/afs/cmservice.c | 1 - fs/afs/internal.h | 1 - fs/afs/kafsasyncd.c | 1 - fs/afs/kafstimod.c | 1 - fs/afs/vnode.h | 1 - fs/befs/datastream.c | 1 - fs/cifs/cifsfs.c | 1 - fs/cifs/file.c | 1 - fs/cifs/transport.c | 1 - fs/devfs/base.c | 1 - fs/intermezzo/intermezzo_journal.h | 2 -- fs/intermezzo/intermezzo_kml.h | 1 - fs/intermezzo/intermezzo_psdev.h | 1 - fs/lockd/svc.c | 1 - fs/nls/nls_base.c | 1 - fs/ntfs/ntfs.h | 2 -- fs/udf/super.c | 1 - fs/udf/udfdecl.h | 4 ---- include/acpi/acpi_bus.h | 1 - include/linux/auto_fs.h | 1 - 45 files changed, 55 deletions(-) diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index 195a9ccdeb1dd..bc801c8e13bdf 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c @@ -25,7 +25,6 @@ */ -#include #include #include #include diff --git a/drivers/atm/horizon.h b/drivers/atm/horizon.h index 5e51d487b4237..ec5ba498df49a 100644 --- a/drivers/atm/horizon.h +++ b/drivers/atm/horizon.h @@ -31,7 +31,6 @@ #define DRIVER_ATM_HORIZON_H #include -#include #ifdef CONFIG_ATM_HORIZON_DEBUG #define DEBUG_HORIZON diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index 044591ff985a0..d0257727e8b80 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c @@ -40,7 +40,6 @@ *******************************************************************************/ -#include #include #include #include diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 1d45a9d8047d8..f71ad544ad7fc 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c @@ -20,7 +20,6 @@ #define DAC960_DriverDate "14 November 2002" -#include #include #include #include diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 8d2fd57b1b3ad..06075c5b43946 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -23,7 +23,6 @@ #include /* CONFIG_PROC_FS */ #include #include -#include #include #include #include diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c index 5ca3185b32c68..d5582fd30527f 100644 --- a/drivers/bluetooth/hci_bcsp.c +++ b/drivers/bluetooth/hci_bcsp.c @@ -33,7 +33,6 @@ #include #include -#include #include #include #include diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c index 1c5457500a1cd..25c9725717b74 100644 --- a/drivers/bluetooth/hci_h4.c +++ b/drivers/bluetooth/hci_h4.c @@ -32,7 +32,6 @@ #include #include -#include #include #include #include diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 4943401d71b07..9cb38f1c6db51 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -32,7 +32,6 @@ #include #include -#include #include #include #include diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index c3ac4121e7930..91d707e05c5d9 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c @@ -36,7 +36,6 @@ #include #include -#include #include #include #include diff --git a/drivers/char/mwave/3780i.c b/drivers/char/mwave/3780i.c index 473ccbaf6f071..0fb356e985305 100644 --- a/drivers/char/mwave/3780i.c +++ b/drivers/char/mwave/3780i.c @@ -46,7 +46,6 @@ * First release to the public */ -#include #include #include #include diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c index ef3dd96fdbff0..e53d25fb7cbbf 100644 --- a/drivers/char/mwave/mwavedd.c +++ b/drivers/char/mwave/mwavedd.c @@ -46,7 +46,6 @@ * First release to the public */ -#include #include #include #include diff --git a/drivers/char/mwave/smapi.c b/drivers/char/mwave/smapi.c index a17805ca231c6..009a41cfa0f7d 100644 --- a/drivers/char/mwave/smapi.c +++ b/drivers/char/mwave/smapi.c @@ -46,7 +46,6 @@ * First release to the public */ -#include #include #include /* CMOS defines */ #include "smapi.h" diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c index 3dcbbf2188beb..328f2701c5c68 100644 --- a/drivers/char/n_hdlc.c +++ b/drivers/char/n_hdlc.c @@ -81,7 +81,6 @@ #define HDLC_MAGIC 0x239e #define HDLC_VERSION "$Revision: 4.8 $" -#include #include #include #include diff --git a/drivers/char/sx.c b/drivers/char/sx.c index 203fbfb14b662..e809b8e1a9c8a 100644 --- a/drivers/char/sx.c +++ b/drivers/char/sx.c @@ -219,7 +219,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c index e55e9abb184de..455b9fa19a304 100644 --- a/drivers/char/synclink.c +++ b/drivers/char/synclink.c @@ -66,7 +66,6 @@ #include #include -#include #include #include #include diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c index 587dcb3a669dd..f5d14932ba2fe 100644 --- a/drivers/char/synclinkmp.c +++ b/drivers/char/synclinkmp.c @@ -36,7 +36,6 @@ #include #include -#include #include #include #include diff --git a/drivers/char/vt.c b/drivers/char/vt.c index a24ada1612f64..464c3404d4dc7 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -97,7 +97,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/ieee1394/ieee1394_types.h b/drivers/ieee1394/ieee1394_types.h index 60efa9ec9a074..d59d6f8d44013 100644 --- a/drivers/ieee1394/ieee1394_types.h +++ b/drivers/ieee1394/ieee1394_types.h @@ -4,7 +4,6 @@ #include #include -#include #include #include #include diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 4a74607438854..26c0af5eec9f2 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c @@ -22,7 +22,6 @@ #include "ieee1394_types.h" #include "ieee1394.h" -#include "nodemgr.h" #include "hosts.h" #include "ieee1394_transactions.h" #include "highlevel.h" diff --git a/drivers/ieee1394/ohci1394.h b/drivers/ieee1394/ohci1394.h index 8e75ca0471f6a..506b0d8467100 100644 --- a/drivers/ieee1394/ohci1394.h +++ b/drivers/ieee1394/ohci1394.h @@ -21,8 +21,6 @@ #ifndef _OHCI1394_H #define _OHCI1394_H -#include - #include "ieee1394_types.h" #include diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c index 9ca37d6f7b0d0..b56e15b59a3ea 100644 --- a/drivers/ieee1394/raw1394.c +++ b/drivers/ieee1394/raw1394.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 3cd5840f35296..96df96587de5b 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c @@ -54,7 +54,6 @@ #include #include #include -#include #include #include @@ -63,7 +62,6 @@ #include #include #include -#include #include #include "../scsi/scsi.h" @@ -74,7 +72,6 @@ #include "ieee1394_core.h" #include "nodemgr.h" #include "hosts.h" -#include "nodemgr.h" #include "highlevel.h" #include "ieee1394_transactions.h" #include "sbp2.h" diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c index 112b1b89593bb..f477745e898e7 100644 --- a/drivers/ieee1394/video1394.c +++ b/drivers/ieee1394/video1394.c @@ -46,7 +46,6 @@ #include "ieee1394.h" #include "ieee1394_types.h" -#include "nodemgr.h" #include "hosts.h" #include "ieee1394_core.h" #include "highlevel.h" diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 680507243d4a1..a25d05a69f499 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c @@ -66,7 +66,6 @@ /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ #include -#include #include #include #include diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h index 2f07c08dd2554..76ffd0e6569ea 100644 --- a/drivers/message/fusion/mptscsih.h +++ b/drivers/message/fusion/mptscsih.h @@ -60,9 +60,6 @@ #ifndef SCSIHOST_H_INCLUDED #define SCSIHOST_H_INCLUDED -/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ - -#include "linux/version.h" /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /* diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c index e5e8397418037..23eb95d23f621 100644 --- a/fs/afs/cmservice.c +++ b/fs/afs/cmservice.c @@ -9,7 +9,6 @@ * 2 of the License, or (at your option) any later version. */ -#include #include #include #include diff --git a/fs/afs/internal.h b/fs/afs/internal.h index 9f0928f8c41a5..068f980714568 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -12,7 +12,6 @@ #ifndef AFS_INTERNAL_H #define AFS_INTERNAL_H -#include #include #include #include diff --git a/fs/afs/kafsasyncd.c b/fs/afs/kafsasyncd.c index 9ac95adeff33b..0af8f31477e5a 100644 --- a/fs/afs/kafsasyncd.c +++ b/fs/afs/kafsasyncd.c @@ -16,7 +16,6 @@ * - poll volume location servers to keep up to date volume location lists */ -#include #include #include #include diff --git a/fs/afs/kafstimod.c b/fs/afs/kafstimod.c index 084b1f9b1c56e..0963711ac0157 100644 --- a/fs/afs/kafstimod.c +++ b/fs/afs/kafstimod.c @@ -9,7 +9,6 @@ * 2 of the License, or (at your option) any later version. */ -#include #include #include #include diff --git a/fs/afs/vnode.h b/fs/afs/vnode.h index afee9628f1f02..67710bb92d392 100644 --- a/fs/afs/vnode.h +++ b/fs/afs/vnode.h @@ -13,7 +13,6 @@ #define _LINUX_AFS_VNODE_H #include -#include #include "server.h" #include "kafstimod.h" diff --git a/fs/befs/datastream.c b/fs/befs/datastream.c index 75289900ccd29..785f6b2d5d106 100644 --- a/fs/befs/datastream.c +++ b/fs/befs/datastream.c @@ -11,7 +11,6 @@ */ #include -#include #include #include #include diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index ea39e21685c8f..fd3641203e4c7 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 5e223961e9fb9..b3b7ea9f8b7d1 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 1e037749e8f4a..377eebddc7e35 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include "cifspdu.h" diff --git a/fs/devfs/base.c b/fs/devfs/base.c index fda21d6af987b..dd03e0397cc28 100644 --- a/fs/devfs/base.c +++ b/fs/devfs/base.c @@ -674,7 +674,6 @@ #include #include #include -#include #include #include diff --git a/fs/intermezzo/intermezzo_journal.h b/fs/intermezzo/intermezzo_journal.h index 75ec0977e33d5..99d588d48310e 100644 --- a/fs/intermezzo/intermezzo_journal.h +++ b/fs/intermezzo/intermezzo_journal.h @@ -2,8 +2,6 @@ #define __PRESTO_JOURNAL_H -#include - struct journal_prefix { int len; u32 version; diff --git a/fs/intermezzo/intermezzo_kml.h b/fs/intermezzo/intermezzo_kml.h index c545bbd79fdee..80b4440eda81b 100644 --- a/fs/intermezzo/intermezzo_kml.h +++ b/fs/intermezzo/intermezzo_kml.h @@ -1,7 +1,6 @@ #ifndef __INTERMEZZO_KML_H #define __INTERMEZZO_KML_H -#include #include "intermezzo_psdev.h" #include #include "intermezzo_journal.h" diff --git a/fs/intermezzo/intermezzo_psdev.h b/fs/intermezzo/intermezzo_psdev.h index aa7fe70df356d..e17f049d917f0 100644 --- a/fs/intermezzo/intermezzo_psdev.h +++ b/fs/intermezzo/intermezzo_psdev.h @@ -9,7 +9,6 @@ #define PROCNAME_SIZE 32 #include #include -#include /* represents state of an instance reached with /dev/intermezzo */ /* communication pending & processing queues */ diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 9a96620a195f3..479a8b5500468 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c index 405a83c1c946d..972e460730725 100644 --- a/fs/nls/nls_base.c +++ b/fs/nls/nls_base.c @@ -8,7 +8,6 @@ * */ -#include #include #include #include diff --git a/fs/ntfs/ntfs.h b/fs/ntfs/ntfs.h index 5dc84b40b2d1d..fb28bde1ec9c4 100644 --- a/fs/ntfs/ntfs.h +++ b/fs/ntfs/ntfs.h @@ -24,8 +24,6 @@ #ifndef _LINUX_NTFS_H #define _LINUX_NTFS_H -#include - #include #include #include diff --git a/fs/udf/super.c b/fs/udf/super.c index 2b82a04518140..827d7dce65aba 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -46,7 +46,6 @@ #include "udfdecl.h" #include -#include #include #include #include diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index 8f8db132fdfc5..683e900e3a8fd 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h @@ -12,10 +12,6 @@ #include #include -#ifndef LINUX_VERSION_CODE -#include -#endif - #include "udfend.h" #define udf_fixed_to_variable(x) ( ( ( (x) >> 5 ) * 39 ) + ( (x) & 0x0000001F ) ) diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 7e0f5941433aa..82d1fce42e5ec 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -26,7 +26,6 @@ #ifndef __ACPI_BUS_H__ #define __ACPI_BUS_H__ -#include #include #include diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h index 13bc53bc06f5a..c21e5972a3e8a 100644 --- a/include/linux/auto_fs.h +++ b/include/linux/auto_fs.h @@ -15,7 +15,6 @@ #define _LINUX_AUTO_FS_H #ifdef __KERNEL__ -#include #include #include #include -- 2.53.0