scsi/NCR5380: reduce depth of sun3_scsi nested includes (9f6620a3) · Commits · 戴 / test

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>

drivers/scsi/sun3_scsi.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@
		#include "scsi.h"
		#include <scsi/scsi_host.h>
		#include "sun3_scsi.h"
		#include "NCR5380.h"

		/* #define OLDDMA */

drivers/scsi/sun3_scsi.h

+3 −5

Original line number	Diff line number	Diff line
		@@ -29,8 +29,8 @@
		* 1+ (800) 334-5454
		*/

		#ifndef SUN3_NCR5380_H
		#define SUN3_NCR5380_H
		#ifndef SUN3_SCSI_H
		#define SUN3_SCSI_H

		#define SUN3SCSI_PUBLIC_RELEASE 1

		@@ -182,7 +182,5 @@ struct sun3_udc_regs {

		#define VME_DATA24 0x3d00

		#include "NCR5380.h"

		#endif /* SUN3_NCR5380_H */
		#endif /* SUN3_SCSI_H */

drivers/scsi/sun3_scsi_vme.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@
		#include "initio.h"
		#include <scsi/scsi_host.h>
		#include "sun3_scsi.h"
		#include "NCR5380.h"

		extern int sun3_map_test(unsigned long, char *);

Admin message