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

scsi/NCR5380: reduce depth of sun3_scsi nested includes

Move the #include "NCR5380.h" out of the sun3_scsi.h header file and into
the driver .c files, like all the other NCR5380 drivers in the tree.

This improves uniformity and reduces the depth of nested includes. The
sequence of #include's, #define's and #if's no longer does my head in.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Sam Creasey <sammy@sammy.net>
Signed-off-by: Christoph Hellwig <hch@lst.de>

authored by

Finn Thain and committed by
Christoph Hellwig
9f6620a3 a469dc27

+5 -5
+1
drivers/scsi/sun3_scsi.c
··· 71 71 #include "scsi.h" 72 72 #include <scsi/scsi_host.h> 73 73 #include "sun3_scsi.h" 74 + #include "NCR5380.h" 74 75 75 76 /* #define OLDDMA */ 76 77
+3 -5
drivers/scsi/sun3_scsi.h
··· 29 29 * 1+ (800) 334-5454 30 30 */ 31 31 32 - #ifndef SUN3_NCR5380_H 33 - #define SUN3_NCR5380_H 32 + #ifndef SUN3_SCSI_H 33 + #define SUN3_SCSI_H 34 34 35 35 #define SUN3SCSI_PUBLIC_RELEASE 1 36 36 ··· 182 182 183 183 #define VME_DATA24 0x3d00 184 184 185 - #include "NCR5380.h" 186 - 187 - #endif /* SUN3_NCR5380_H */ 185 + #endif /* SUN3_SCSI_H */ 188 186
+1
drivers/scsi/sun3_scsi_vme.c
··· 42 42 #include "initio.h" 43 43 #include <scsi/scsi_host.h> 44 44 #include "sun3_scsi.h" 45 + #include "NCR5380.h" 45 46 46 47 extern int sun3_map_test(unsigned long, char *); 47 48