diff options
author | Finn Thain <fthain@telegraphics.com.au> | 2016-01-03 16:05:46 +1100 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-01-06 21:43:02 -0500 |
commit | 161c0059a2a80aefe7000d9ab7ce5c36e5463b5f (patch) | |
tree | b33b9b25a534fcce777d46ae22127d5cb3fafc7c | |
parent | e0783ed3660aecb83af580cdace583980b22809b (diff) | |
download | linux-161c0059a2a80aefe7000d9ab7ce5c36e5463b5f.tar.gz linux-161c0059a2a80aefe7000d9ab7ce5c36e5463b5f.tar.bz2 linux-161c0059a2a80aefe7000d9ab7ce5c36e5463b5f.zip |
ncr5380: Cleanup #include directives
Remove unused includes (stat.h, signal.h, proc_fs.h) and move includes
needed by the core drivers into the common header (delay.h etc).
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: Ondrej Zary <linux@rainbow-software.org>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r-- | drivers/scsi/NCR5380.c | 2 | ||||
-rw-r--r-- | drivers/scsi/NCR5380.h | 4 | ||||
-rw-r--r-- | drivers/scsi/arm/cumana_1.c | 4 | ||||
-rw-r--r-- | drivers/scsi/arm/oak.c | 2 | ||||
-rw-r--r-- | drivers/scsi/atari_NCR5380.c | 5 | ||||
-rw-r--r-- | drivers/scsi/atari_scsi.c | 1 | ||||
-rw-r--r-- | drivers/scsi/dmx3191d.c | 5 | ||||
-rw-r--r-- | drivers/scsi/dtc.c | 4 | ||||
-rw-r--r-- | drivers/scsi/g_NCR5380.c | 6 | ||||
-rw-r--r-- | drivers/scsi/mac_scsi.c | 1 | ||||
-rw-r--r-- | drivers/scsi/pas16.c | 4 | ||||
-rw-r--r-- | drivers/scsi/t128.c | 3 |
12 files changed, 7 insertions, 34 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index c6b69ee0021a..9ef26b64255a 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c @@ -79,8 +79,6 @@ * 4. Test SCSI-II tagged queueing (I have no devices which support * tagged queueing) */ -#include <scsi/scsi_dbg.h> -#include <scsi/scsi_transport_spi.h> #if (NDEBUG & NDEBUG_LISTS) #define LIST(x,y) {printk("LINE:%d Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); if ((x)==(y)) udelay(5); } diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h index e8a26eab32dd..9777602daa3d 100644 --- a/drivers/scsi/NCR5380.h +++ b/drivers/scsi/NCR5380.h @@ -22,8 +22,12 @@ #ifndef NCR5380_H #define NCR5380_H +#include <linux/delay.h> #include <linux/interrupt.h> +#include <linux/workqueue.h> +#include <scsi/scsi_dbg.h> #include <scsi/scsi_eh.h> +#include <scsi/scsi_transport_spi.h> #define NDEBUG_ARBITRATION 0x1 #define NDEBUG_AUTOSENSE 0x2 diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c index f9fb8dabdbbd..921c982886ae 100644 --- a/drivers/scsi/arm/cumana_1.c +++ b/drivers/scsi/arm/cumana_1.c @@ -4,9 +4,7 @@ * Copyright 1995-2002, Russell King */ #include <linux/module.h> -#include <linux/signal.h> #include <linux/ioport.h> -#include <linux/delay.h> #include <linux/blkdev.h> #include <linux/init.h> @@ -15,8 +13,6 @@ #include <scsi/scsi_host.h> -#include <scsi/scsicam.h> - #define PSEUDO_DMA #define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata) diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c index d95a1d4f4e02..719600a373d6 100644 --- a/drivers/scsi/arm/oak.c +++ b/drivers/scsi/arm/oak.c @@ -5,9 +5,7 @@ */ #include <linux/module.h> -#include <linux/signal.h> #include <linux/ioport.h> -#include <linux/delay.h> #include <linux/blkdev.h> #include <linux/init.h> diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c index c14cfb1cc3dd..8024f1cb9756 100644 --- a/drivers/scsi/atari_NCR5380.c +++ b/drivers/scsi/atari_NCR5380.c @@ -68,9 +68,6 @@ /* Adapted for the sun3 by Sam Creasey. */ -#include <scsi/scsi_dbg.h> -#include <scsi/scsi_transport_spi.h> - #if (NDEBUG & NDEBUG_LISTS) #define LIST(x, y) \ do { \ @@ -517,8 +514,6 @@ static inline int NCR5380_poll_politely(struct Scsi_Host *instance, reg, bit, val, wait); } -#include <linux/delay.h> - #if NDEBUG static struct { unsigned char mask; diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c index 1c6c4ca0a82f..2ba075749326 100644 --- a/drivers/scsi/atari_scsi.c +++ b/drivers/scsi/atari_scsi.c @@ -66,7 +66,6 @@ #include <linux/module.h> #include <linux/types.h> -#include <linux/delay.h> #include <linux/blkdev.h> #include <linux/interrupt.h> #include <linux/init.h> diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c index db415359fee8..05402830defe 100644 --- a/drivers/scsi/dmx3191d.c +++ b/drivers/scsi/dmx3191d.c @@ -41,11 +41,6 @@ #define NCR5380_implementation_fields /* none */ -/* - * Includes needed for NCR5380.[ch] (XXX: Move them to NCR5380.h) - */ -#include <linux/delay.h> - #include "NCR5380.h" #include "NCR5380.c" diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c index 1beefdbcbea8..6c96dad5cf23 100644 --- a/drivers/scsi/dtc.c +++ b/drivers/scsi/dtc.c @@ -46,15 +46,13 @@ #include <linux/module.h> -#include <linux/signal.h> #include <linux/blkdev.h> -#include <linux/delay.h> -#include <linux/stat.h> #include <linux/string.h> #include <linux/init.h> #include <linux/interrupt.h> #include <linux/io.h> #include <scsi/scsi_host.h> + #include "dtc.h" #define AUTOPROBE_IRQ #include "NCR5380.h" diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c index e71c79683925..1e8f29f500d5 100644 --- a/drivers/scsi/g_NCR5380.c +++ b/drivers/scsi/g_NCR5380.c @@ -63,16 +63,14 @@ #endif #include <asm/io.h> -#include <linux/signal.h> #include <linux/blkdev.h> +#include <linux/module.h> #include <scsi/scsi_host.h> #include "g_NCR5380.h" #include "NCR5380.h" -#include <linux/stat.h> #include <linux/init.h> #include <linux/ioport.h> #include <linux/isapnp.h> -#include <linux/delay.h> #include <linux/interrupt.h> static int ncr_irq; @@ -732,7 +730,7 @@ static struct scsi_host_template driver_template = { .cmd_per_lun = CMD_PER_LUN, .use_clustering = DISABLE_CLUSTERING, }; -#include <linux/module.h> + #include "scsi_module.c" module_param(ncr_irq, int, 0); diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c index f8ed2acd1456..420c2e204c13 100644 --- a/drivers/scsi/mac_scsi.c +++ b/drivers/scsi/mac_scsi.c @@ -12,7 +12,6 @@ */ #include <linux/types.h> -#include <linux/delay.h> #include <linux/module.h> #include <linux/ioport.h> #include <linux/init.h> diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c index 4570536187d8..6a5896dade20 100644 --- a/drivers/scsi/pas16.c +++ b/drivers/scsi/pas16.c @@ -69,14 +69,10 @@ #include <linux/module.h> -#include <linux/signal.h> -#include <linux/proc_fs.h> #include <asm/io.h> #include <asm/dma.h> #include <linux/blkdev.h> -#include <linux/delay.h> #include <linux/interrupt.h> -#include <linux/stat.h> #include <linux/init.h> #include <scsi/scsi_host.h> diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c index 3dac6d7f5d22..167c0750eba6 100644 --- a/drivers/scsi/t128.c +++ b/drivers/scsi/t128.c @@ -68,14 +68,11 @@ * 15 9-11 */ -#include <linux/signal.h> #include <linux/io.h> #include <linux/blkdev.h> #include <linux/interrupt.h> -#include <linux/stat.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/delay.h> #include <scsi/scsi_host.h> #include "t128.h" |