Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0be4a7d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

[SCSI] remove Scsi_Host_Template typedef 



Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent c0ed79a3

Documentation/scsi/scsi_mid_low_api.txt

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ Next, there is a movement to "outlaw" typedefs introducing synonyms for 
struct tags. Both can be still found in the SCSI subsystem, but

the typedefs have been moved to a single file, scsi_typedefs.h to

make their future removal easier, for example: 

"typedef struct scsi_host_template Scsi_Host_Template;"

"typedef struct scsi_cmnd Scsi_Cmnd;"



Also, most C99 enhancements are encouraged to the extent they are supported

by the relevant gcc compilers. So C99 style structure and array

drivers/scsi/53c7xx.c

+3 −3
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static void NCR53c7x0_soft_reset (struct Scsi_Host *host); 
/* Size of event list (per host adapter) */

static int track_events = 0;

static struct Scsi_Host *first_host = NULL;	/* Head of list of NCR boards */

static Scsi_Host_Template *the_template = NULL;	

static struct scsi_host_template *the_template = NULL;



/* NCR53c710 script handling code */
@@ -1103,7 +1103,7 @@ NCR53c7x0_init (struct Scsi_Host *host) { 
}



/* 

 * Function : int ncr53c7xx_init(Scsi_Host_Template *tpnt, int board, int chip,

 * Function : int ncr53c7xx_init(struct scsi_host_template *tpnt, int board, int chip,

 *	unsigned long base, int io_port, int irq, int dma, long long options,

 *	int clock);

 *
@@ -1118,7 +1118,7 @@ NCR53c7x0_init (struct Scsi_Host *host) { 
 */



int 

ncr53c7xx_init (Scsi_Host_Template *tpnt, int board, int chip,

ncr53c7xx_init (struct scsi_host_template *tpnt, int board, int chip,

    unsigned long base, int io_port, int irq, int dma, 

    long long options, int clock)

{

drivers/scsi/53c7xx.h

+1 −1
Original line number Diff line number Diff line
@@ -1600,7 +1600,7 @@ struct NCR53c7x0_hostdata { 
/* Paranoid people could use panic() here. */

#define FATAL(host) shutdown((host));



extern int ncr53c7xx_init(Scsi_Host_Template *tpnt, int board, int chip,

extern int ncr53c7xx_init(struct scsi_host_template *tpnt, int board, int chip,

			  unsigned long base, int io_port, int irq, int dma,

			  long long options, int clock);

drivers/scsi/NCR53C9x.c

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs) 
/* Allocate structure and insert basic data such as SCSI chip frequency

 * data and a pointer to the device

 */

struct NCR_ESP* esp_allocate(Scsi_Host_Template *tpnt, void *esp_dev)

struct NCR_ESP* esp_allocate(struct scsi_host_template *tpnt, void *esp_dev)

{

	struct NCR_ESP *esp, *elink;

	struct Scsi_Host *esp_host;

drivers/scsi/NCR53C9x.h

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ extern int nesps, esps_in_use, esps_running; 


/* External functions */

extern void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs);

extern struct NCR_ESP *esp_allocate(Scsi_Host_Template *, void *);

extern struct NCR_ESP *esp_allocate(struct scsi_host_template *, void *);

extern void esp_deallocate(struct NCR_ESP *);

extern void esp_release(void);

extern void esp_initialize(struct NCR_ESP *);