Skip to content

K
Kernel

openeuler / Kernel
接近 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 d0be4a7d 编写于 作者: C Christoph Hellwig 提交者： James Bottomley
浏览文件
操作

[SCSI] remove Scsi_Host_Template typedef 

Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
上级 c0ed79a3
展开全部 隐藏空白更改
内联 并排
Showing with 185 addition and 186 deletion
Documentation/scsi/scsi_mid_low_api.txt
浏览文件 @ d0be4a7d
...@@ -346,7 +346,7 @@ Next, there is a movement to "outlaw" typedefs introducing synonyms for ...@@ -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 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 the typedefs have been moved to a single file, scsi_typedefs.h to
make their future removal easier, for example: 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 Also, most C99 enhancements are encouraged to the extent they are supported
by the relevant gcc compilers. So C99 style structure and array by the relevant gcc compilers. So C99 style structure and array
......
drivers/scsi/53c7xx.c
浏览文件 @ d0be4a7d
...@@ -343,7 +343,7 @@ static void NCR53c7x0_soft_reset (struct Scsi_Host *host); ...@@ -343,7 +343,7 @@ static void NCR53c7x0_soft_reset (struct Scsi_Host *host);
/* Size of event list (per host adapter) */ /* Size of event list (per host adapter) */
static int track_events = 0; static int track_events = 0;
static struct Scsi_Host *first_host = NULL; /* Head of list of NCR boards */ 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 */ /* NCR53c710 script handling code */
...@@ -1103,7 +1103,7 @@ NCR53c7x0_init (struct Scsi_Host *host) { ...@@ -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, * unsigned long base, int io_port, int irq, int dma, long long options,
* int clock); * int clock);
* *
...@@ -1118,7 +1118,7 @@ NCR53c7x0_init (struct Scsi_Host *host) { ...@@ -1118,7 +1118,7 @@ NCR53c7x0_init (struct Scsi_Host *host) {
*/ */
int 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, unsigned long base, int io_port, int irq, int dma,
long long options, int clock) long long options, int clock)
{ {
......
drivers/scsi/53c7xx.h
浏览文件 @ d0be4a7d
...@@ -1600,7 +1600,7 @@ struct NCR53c7x0_hostdata { ...@@ -1600,7 +1600,7 @@ struct NCR53c7x0_hostdata {
/* Paranoid people could use panic() here. */ /* Paranoid people could use panic() here. */
#define FATAL(host) shutdown((host)); #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, unsigned long base, int io_port, int irq, int dma,
long long options, int clock); long long options, int clock);
......
drivers/scsi/NCR53C9x.c
浏览文件 @ d0be4a7d
...@@ -529,7 +529,7 @@ void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs) ...@@ -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 /* Allocate structure and insert basic data such as SCSI chip frequency
* data and a pointer to the device * 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 NCR_ESP *esp, *elink;
struct Scsi_Host *esp_host; struct Scsi_Host *esp_host;
......
drivers/scsi/NCR53C9x.h
浏览文件 @ d0be4a7d
...@@ -653,7 +653,7 @@ extern int nesps, esps_in_use, esps_running; ...@@ -653,7 +653,7 @@ extern int nesps, esps_in_use, esps_running;
/* External functions */ /* External functions */
extern void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs); 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_deallocate(struct NCR_ESP *);
extern void esp_release(void); extern void esp_release(void);
extern void esp_initialize(struct NCR_ESP *); extern void esp_initialize(struct NCR_ESP *);
......
drivers/scsi/NCR53c406a.c
浏览文件 @ d0be4a7d
...@@ -447,7 +447,7 @@ static __inline__ int NCR53c406a_pio_write(unsigned char *request, unsigned int ...@@ -447,7 +447,7 @@ static __inline__ int NCR53c406a_pio_write(unsigned char *request, unsigned int
} }
#endif /* USE_PIO */ #endif /* USE_PIO */
static int __init NCR53c406a_detect(Scsi_Host_Template * tpnt) static int __init NCR53c406a_detect(struct scsi_host_template * tpnt)
{ {
int present = 0; int present = 0;
struct Scsi_Host *shpnt = NULL; struct Scsi_Host *shpnt = NULL;
...@@ -1057,7 +1057,7 @@ MODULE_LICENSE("GPL"); ...@@ -1057,7 +1057,7 @@ MODULE_LICENSE("GPL");
* Use SG_NONE if DMA mode is enabled! * Use SG_NONE if DMA mode is enabled!
*/ */
static Scsi_Host_Template driver_template = static struct scsi_host_template driver_template =
{ {
.proc_name = "NCR53c406a" /* proc_name */, .proc_name = "NCR53c406a" /* proc_name */,
.name = "NCR53c406a" /* name */, .name = "NCR53c406a" /* name */,
......
drivers/scsi/a2091.c
浏览文件 @ d0be4a7d
...@@ -173,7 +173,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, ...@@ -173,7 +173,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
} }
} }
int __init a2091_detect(Scsi_Host_Template *tpnt) int __init a2091_detect(struct scsi_host_template *tpnt)
{ {
static unsigned char called = 0; static unsigned char called = 0;
struct Scsi_Host *instance; struct Scsi_Host *instance;
...@@ -234,7 +234,7 @@ static int a2091_bus_reset(Scsi_Cmnd *cmd) ...@@ -234,7 +234,7 @@ static int a2091_bus_reset(Scsi_Cmnd *cmd)
#define HOSTS_C #define HOSTS_C
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "A2901", .proc_name = "A2901",
.name = "Commodore A2091/A590 SCSI", .name = "Commodore A2091/A590 SCSI",
.detect = a2091_detect, .detect = a2091_detect,
......
drivers/scsi/a2091.h
浏览文件 @ d0be4a7d
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/types.h> #include <linux/types.h>
int a2091_detect(Scsi_Host_Template *); int a2091_detect(struct scsi_host_template *);
int a2091_release(struct Scsi_Host *); int a2091_release(struct Scsi_Host *);
const char *wd33c93_info(void); const char *wd33c93_info(void);
int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
......
drivers/scsi/a3000.c
浏览文件 @ d0be4a7d
...@@ -168,7 +168,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, ...@@ -168,7 +168,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
} }
} }
int __init a3000_detect(Scsi_Host_Template *tpnt) int __init a3000_detect(struct scsi_host_template *tpnt)
{ {
wd33c93_regs regs; wd33c93_regs regs;
...@@ -221,7 +221,7 @@ static int a3000_bus_reset(Scsi_Cmnd *cmd) ...@@ -221,7 +221,7 @@ static int a3000_bus_reset(Scsi_Cmnd *cmd)
#define HOSTS_C #define HOSTS_C
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "A3000", .proc_name = "A3000",
.name = "Amiga 3000 built-in SCSI", .name = "Amiga 3000 built-in SCSI",
.detect = a3000_detect, .detect = a3000_detect,
......
drivers/scsi/a3000.h
浏览文件 @ d0be4a7d
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/types.h> #include <linux/types.h>
int a3000_detect(Scsi_Host_Template *); int a3000_detect(struct scsi_host_template *);
int a3000_release(struct Scsi_Host *); int a3000_release(struct Scsi_Host *);
const char *wd33c93_info(void); const char *wd33c93_info(void);
int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
......
drivers/scsi/advansys.c
浏览文件 @ d0be4a7d
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
#include "advansys.h" #include "advansys.h"
#endif #endif
and after "static Scsi_Host_Template builtin_scsi_hosts[] =": and after "static struct scsi_host_template builtin_scsi_hosts[] =":
#ifdef CONFIG_SCSI_ADVANSYS #ifdef CONFIG_SCSI_ADVANSYS
ADVANSYS, ADVANSYS,
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
--- Driver Structures --- Driver Structures
--- Driver Data --- Driver Data
--- Driver Function Prototypes --- Driver Function Prototypes
--- Linux 'Scsi_Host_Template' and advansys_setup() Functions --- Linux 'struct scsi_host_template' and advansys_setup() Functions
--- Loadable Driver Support --- Loadable Driver Support
--- Miscellaneous Driver Functions --- Miscellaneous Driver Functions
--- Functions Required by the Asc Library --- Functions Required by the Asc Library
...@@ -4068,7 +4068,7 @@ STATIC void asc_prt_hex(char *f, uchar *, int); ...@@ -4068,7 +4068,7 @@ STATIC void asc_prt_hex(char *f, uchar *, int);
/* /*
* --- Linux 'Scsi_Host_Template' and advansys_setup() Functions * --- Linux 'struct scsi_host_template' and advansys_setup() Functions
*/ */
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
......
drivers/scsi/advansys.h
浏览文件 @ d0be4a7d
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#define _ADVANSYS_H #define _ADVANSYS_H
/* /*
* Scsi_Host_Template function prototypes. * struct scsi_host_template function prototypes.
*/ */
int advansys_detect(struct scsi_host_template *); int advansys_detect(struct scsi_host_template *);
int advansys_release(struct Scsi_Host *); int advansys_release(struct Scsi_Host *);
......
drivers/scsi/aha152x.c
浏览文件 @ d0be4a7d
...@@ -424,7 +424,7 @@ MODULE_DEVICE_TABLE(isapnp, id_table); ...@@ -424,7 +424,7 @@ MODULE_DEVICE_TABLE(isapnp, id_table);
static int registered_count=0; static int registered_count=0;
static struct Scsi_Host *aha152x_host[2]; static struct Scsi_Host *aha152x_host[2];
static Scsi_Host_Template aha152x_driver_template; static struct scsi_host_template aha152x_driver_template;
/* /*
* internal states of the host * internal states of the host
...@@ -3464,7 +3464,7 @@ static int aha152x_proc_info(struct Scsi_Host *shpnt, char *buffer, char **start ...@@ -3464,7 +3464,7 @@ static int aha152x_proc_info(struct Scsi_Host *shpnt, char *buffer, char **start
return thislength < length ? thislength : length; return thislength < length ? thislength : length;
} }
static Scsi_Host_Template aha152x_driver_template = { static struct scsi_host_template aha152x_driver_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = AHA152X_REVID, .name = AHA152X_REVID,
.proc_name = "aha152x", .proc_name = "aha152x",
......
drivers/scsi/aha1542.c
浏览文件 @ d0be4a7d
...@@ -1021,7 +1021,7 @@ __setup("aha1542=",do_setup); ...@@ -1021,7 +1021,7 @@ __setup("aha1542=",do_setup);
#endif #endif
/* return non-zero on detection */ /* return non-zero on detection */
static int __init aha1542_detect(Scsi_Host_Template * tpnt) static int __init aha1542_detect(struct scsi_host_template * tpnt)
{ {
unsigned char dma_chan; unsigned char dma_chan;
unsigned char irq_level; unsigned char irq_level;
...@@ -1789,7 +1789,7 @@ static int aha1542_biosparam(struct scsi_device *sdev, ...@@ -1789,7 +1789,7 @@ static int aha1542_biosparam(struct scsi_device *sdev,
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "aha1542", .proc_name = "aha1542",
.name = "Adaptec 1542", .name = "Adaptec 1542",
.detect = aha1542_detect, .detect = aha1542_detect,
......
drivers/scsi/aha1542.h
浏览文件 @ d0be4a7d
...@@ -131,7 +131,7 @@ struct ccb { /* Command Control Block 5.3 */ ...@@ -131,7 +131,7 @@ struct ccb { /* Command Control Block 5.3 */
/* REQUEST SENSE */ /* REQUEST SENSE */
}; };
static int aha1542_detect(Scsi_Host_Template *); static int aha1542_detect(struct scsi_host_template *);
static int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
static int aha1542_bus_reset(Scsi_Cmnd * SCpnt); static int aha1542_bus_reset(Scsi_Cmnd * SCpnt);
static int aha1542_dev_reset(Scsi_Cmnd * SCpnt); static int aha1542_dev_reset(Scsi_Cmnd * SCpnt);
......
drivers/scsi/aha1740.c
浏览文件 @ d0be4a7d
...@@ -570,7 +570,7 @@ static int aha1740_eh_abort_handler (Scsi_Cmnd *dummy) ...@@ -570,7 +570,7 @@ static int aha1740_eh_abort_handler (Scsi_Cmnd *dummy)
return 0; return 0;
} }
static Scsi_Host_Template aha1740_template = { static struct scsi_host_template aha1740_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.proc_name = "aha1740", .proc_name = "aha1740",
.proc_info = aha1740_proc_info, .proc_info = aha1740_proc_info,
......
drivers/scsi/ahci.c
浏览文件 @ d0be4a7d
...@@ -196,7 +196,7 @@ static u8 ahci_check_status(struct ata_port *ap); ...@@ -196,7 +196,7 @@ static u8 ahci_check_status(struct ata_port *ap);
static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
static void ahci_remove_one (struct pci_dev *pdev); static void ahci_remove_one (struct pci_dev *pdev);
static Scsi_Host_Template ahci_sht = { static struct scsi_host_template ahci_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/aic7xxx_old.c
浏览文件 @ d0be4a7d
...@@ -7865,7 +7865,7 @@ detect_maxscb(struct aic7xxx_host *p) ...@@ -7865,7 +7865,7 @@ detect_maxscb(struct aic7xxx_host *p)
* Register a Adaptec aic7xxx chip SCSI controller with the kernel. * Register a Adaptec aic7xxx chip SCSI controller with the kernel.
*-F*************************************************************************/ *-F*************************************************************************/
static int static int
aic7xxx_register(Scsi_Host_Template *template, struct aic7xxx_host *p, aic7xxx_register(struct scsi_host_template *template, struct aic7xxx_host *p,
int reset_delay) int reset_delay)
{ {
int i, result; int i, result;
...@@ -8412,7 +8412,7 @@ aic7xxx_chip_reset(struct aic7xxx_host *p) ...@@ -8412,7 +8412,7 @@ aic7xxx_chip_reset(struct aic7xxx_host *p)
* and a pointer to a aic7xxx_host struct upon success. * and a pointer to a aic7xxx_host struct upon success.
*-F*************************************************************************/ *-F*************************************************************************/
static struct aic7xxx_host * static struct aic7xxx_host *
aic7xxx_alloc(Scsi_Host_Template *sht, struct aic7xxx_host *temp) aic7xxx_alloc(struct scsi_host_template *sht, struct aic7xxx_host *temp)
{ {
struct aic7xxx_host *p = NULL; struct aic7xxx_host *p = NULL;
struct Scsi_Host *host; struct Scsi_Host *host;
...@@ -8991,7 +8991,7 @@ aic7xxx_configure_bugs(struct aic7xxx_host *p) ...@@ -8991,7 +8991,7 @@ aic7xxx_configure_bugs(struct aic7xxx_host *p)
* mid-level SCSI code is overhauled. * mid-level SCSI code is overhauled.
*-F*************************************************************************/ *-F*************************************************************************/
static int static int
aic7xxx_detect(Scsi_Host_Template *template) aic7xxx_detect(struct scsi_host_template *template)
{ {
struct aic7xxx_host *temp_p = NULL; struct aic7xxx_host *temp_p = NULL;
struct aic7xxx_host *current_p = NULL; struct aic7xxx_host *current_p = NULL;
...@@ -11161,7 +11161,7 @@ MODULE_LICENSE("Dual BSD/GPL"); ...@@ -11161,7 +11161,7 @@ MODULE_LICENSE("Dual BSD/GPL");
MODULE_VERSION(AIC7XXX_H_VERSION); MODULE_VERSION(AIC7XXX_H_VERSION);
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_info = aic7xxx_proc_info, .proc_info = aic7xxx_proc_info,
.detect = aic7xxx_detect, .detect = aic7xxx_detect,
.release = aic7xxx_release, .release = aic7xxx_release,
......
drivers/scsi/amiga7xx.c
浏览文件 @ d0be4a7d
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "amiga7xx.h" #include "amiga7xx.h"
static int amiga7xx_register_one(Scsi_Host_Template *tpnt, static int amiga7xx_register_one(struct scsi_host_template *tpnt,
unsigned long address) unsigned long address)
{ {
long long options; long long options;
...@@ -66,7 +66,7 @@ static struct { ...@@ -66,7 +66,7 @@ static struct {
{ 0 } { 0 }
}; };
static int __init amiga7xx_zorro_detect(Scsi_Host_Template *tpnt) static int __init amiga7xx_zorro_detect(struct scsi_host_template *tpnt)
{ {
int num = 0, i; int num = 0, i;
struct zorro_dev *z = NULL; struct zorro_dev *z = NULL;
...@@ -90,7 +90,7 @@ static int __init amiga7xx_zorro_detect(Scsi_Host_Template *tpnt) ...@@ -90,7 +90,7 @@ static int __init amiga7xx_zorro_detect(Scsi_Host_Template *tpnt)
#endif /* CONFIG_ZORRO */ #endif /* CONFIG_ZORRO */
int __init amiga7xx_detect(Scsi_Host_Template *tpnt) int __init amiga7xx_detect(struct scsi_host_template *tpnt)
{ {
static unsigned char called = 0; static unsigned char called = 0;
int num = 0; int num = 0;
...@@ -123,7 +123,7 @@ static int amiga7xx_release(struct Scsi_Host *shost) ...@@ -123,7 +123,7 @@ static int amiga7xx_release(struct Scsi_Host *shost)
return 0; return 0;
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.name = "Amiga NCR53c710 SCSI", .name = "Amiga NCR53c710 SCSI",
.detect = amiga7xx_detect, .detect = amiga7xx_detect,
.release = amiga7xx_release, .release = amiga7xx_release,
......
drivers/scsi/amiga7xx.h
浏览文件 @ d0be4a7d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <linux/types.h> #include <linux/types.h>
int amiga7xx_detect(Scsi_Host_Template *); int amiga7xx_detect(struct scsi_host_template *);
const char *NCR53c7x0_info(void); const char *NCR53c7x0_info(void);
int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
int NCR53c7xx_abort(Scsi_Cmnd *); int NCR53c7xx_abort(Scsi_Cmnd *);
......
drivers/scsi/arm/acornscsi.c
浏览文件 @ d0be4a7d
...@@ -2971,7 +2971,7 @@ int acornscsi_proc_info(struct Scsi_Host *instance, char *buffer, char **start, ...@@ -2971,7 +2971,7 @@ int acornscsi_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
return pos; return pos;
} }
static Scsi_Host_Template acornscsi_template = { static struct scsi_host_template acornscsi_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.proc_info = acornscsi_proc_info, .proc_info = acornscsi_proc_info,
.name = "AcornSCSI", .name = "AcornSCSI",
......
drivers/scsi/arm/arxescsi.c
浏览文件 @ d0be4a7d
...@@ -261,7 +261,7 @@ arxescsi_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t off ...@@ -261,7 +261,7 @@ arxescsi_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t off
return pos; return pos;
} }
static Scsi_Host_Template arxescsi_template = { static struct scsi_host_template arxescsi_template = {
.proc_info = arxescsi_proc_info, .proc_info = arxescsi_proc_info,
.name = "ARXE SCSI card", .name = "ARXE SCSI card",
.info = arxescsi_info, .info = arxescsi_info,
......
drivers/scsi/arm/cumana_1.c
浏览文件 @ d0be4a7d
...@@ -238,7 +238,7 @@ static void cumanascsi_write(struct Scsi_Host *instance, int reg, int value) ...@@ -238,7 +238,7 @@ static void cumanascsi_write(struct Scsi_Host *instance, int reg, int value)
#include "../NCR5380.c" #include "../NCR5380.c"
static Scsi_Host_Template cumanascsi_template = { static struct scsi_host_template cumanascsi_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = "Cumana 16-bit SCSI", .name = "Cumana 16-bit SCSI",
.info = cumanascsi_info, .info = cumanascsi_info,
......
drivers/scsi/arm/cumana_2.c
浏览文件 @ d0be4a7d
...@@ -381,7 +381,7 @@ int cumanascsi_2_proc_info (struct Scsi_Host *host, char *buffer, char **start, ...@@ -381,7 +381,7 @@ int cumanascsi_2_proc_info (struct Scsi_Host *host, char *buffer, char **start,
return pos; return pos;
} }
static Scsi_Host_Template cumanascsi2_template = { static struct scsi_host_template cumanascsi2_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.proc_info = cumanascsi_2_proc_info, .proc_info = cumanascsi_2_proc_info,
.name = "Cumana SCSI II", .name = "Cumana SCSI II",
......
drivers/scsi/arm/ecoscsi.c
浏览文件 @ d0be4a7d
...@@ -155,7 +155,7 @@ printk("reading %p len %d\n",addr, len); ...@@ -155,7 +155,7 @@ printk("reading %p len %d\n",addr, len);
#include "../NCR5380.c" #include "../NCR5380.c"
static Scsi_Host_Template ecoscsi_template = { static struct scsi_host_template ecoscsi_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = "Serial Port EcoSCSI NCR5380", .name = "Serial Port EcoSCSI NCR5380",
.proc_name = "ecoscsi", .proc_name = "ecoscsi",
......
drivers/scsi/arm/eesox.c
浏览文件 @ d0be4a7d
...@@ -499,7 +499,7 @@ static ssize_t eesoxscsi_store_term(struct device *dev, struct device_attribute ...@@ -499,7 +499,7 @@ static ssize_t eesoxscsi_store_term(struct device *dev, struct device_attribute
static DEVICE_ATTR(bus_term, S_IRUGO | S_IWUSR, static DEVICE_ATTR(bus_term, S_IRUGO | S_IWUSR,
eesoxscsi_show_term, eesoxscsi_store_term); eesoxscsi_show_term, eesoxscsi_store_term);
static Scsi_Host_Template eesox_template = { static struct scsi_host_template eesox_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.proc_info = eesoxscsi_proc_info, .proc_info = eesoxscsi_proc_info,
.name = "EESOX SCSI", .name = "EESOX SCSI",
......
drivers/scsi/arm/oak.c
浏览文件 @ d0be4a7d
...@@ -111,7 +111,7 @@ printk("reading %p len %d\n", addr, len); ...@@ -111,7 +111,7 @@ printk("reading %p len %d\n", addr, len);
#include "../NCR5380.c" #include "../NCR5380.c"
static Scsi_Host_Template oakscsi_template = { static struct scsi_host_template oakscsi_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.proc_info = oakscsi_proc_info, .proc_info = oakscsi_proc_info,
.name = "Oak 16-bit SCSI", .name = "Oak 16-bit SCSI",
......
drivers/scsi/arm/powertec.c
浏览文件 @ d0be4a7d
...@@ -293,7 +293,7 @@ powertecscsi_store_term(struct device *dev, struct device_attribute *attr, const ...@@ -293,7 +293,7 @@ powertecscsi_store_term(struct device *dev, struct device_attribute *attr, const
static DEVICE_ATTR(bus_term, S_IRUGO | S_IWUSR, static DEVICE_ATTR(bus_term, S_IRUGO | S_IWUSR,
powertecscsi_show_term, powertecscsi_store_term); powertecscsi_show_term, powertecscsi_store_term);
static Scsi_Host_Template powertecscsi_template = { static struct scsi_host_template powertecscsi_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.proc_info = powertecscsi_proc_info, .proc_info = powertecscsi_proc_info,
.name = "PowerTec SCSI", .name = "PowerTec SCSI",
......
drivers/scsi/ata_piix.c
浏览文件 @ d0be4a7d
...@@ -128,7 +128,7 @@ static struct pci_driver piix_pci_driver = { ...@@ -128,7 +128,7 @@ static struct pci_driver piix_pci_driver = {
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
}; };
static Scsi_Host_Template piix_sht = { static struct scsi_host_template piix_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/atari_NCR5380.c
浏览文件 @ d0be4a7d
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
*/ */
static struct Scsi_Host *first_instance = NULL; static struct Scsi_Host *first_instance = NULL;
static Scsi_Host_Template *the_template = NULL; static struct scsi_host_template *the_template = NULL;
/* Macros ease life... :-) */ /* Macros ease life... :-) */
#define SETUP_HOSTDATA(in) \ #define SETUP_HOSTDATA(in) \
......
drivers/scsi/atari_scsi.c
浏览文件 @ d0be4a7d
...@@ -600,7 +600,7 @@ int atari_queue_command (Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *)) ...@@ -600,7 +600,7 @@ int atari_queue_command (Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))
#endif #endif
int atari_scsi_detect (Scsi_Host_Template *host) int atari_scsi_detect (struct scsi_host_template *host)
{ {
static int called = 0; static int called = 0;
struct Scsi_Host *instance; struct Scsi_Host *instance;
...@@ -1141,7 +1141,7 @@ static void atari_scsi_falcon_reg_write( unsigned char reg, unsigned char value ...@@ -1141,7 +1141,7 @@ static void atari_scsi_falcon_reg_write( unsigned char reg, unsigned char value
#include "atari_NCR5380.c" #include "atari_NCR5380.c"
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_info = atari_scsi_proc_info, .proc_info = atari_scsi_proc_info,
.name = "Atari native SCSI", .name = "Atari native SCSI",
.detect = atari_scsi_detect, .detect = atari_scsi_detect,
......
drivers/scsi/atari_scsi.h
浏览文件 @ d0be4a7d
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
/* (I_HAVE_OVERRUNS stuff removed) */ /* (I_HAVE_OVERRUNS stuff removed) */
#ifndef ASM #ifndef ASM
int atari_scsi_detect (Scsi_Host_Template *); int atari_scsi_detect (struct scsi_host_template *);
const char *atari_scsi_info (struct Scsi_Host *); const char *atari_scsi_info (struct Scsi_Host *);
int atari_scsi_reset (Scsi_Cmnd *, unsigned int); int atari_scsi_reset (Scsi_Cmnd *, unsigned int);
#ifdef MODULE #ifdef MODULE
......
drivers/scsi/blz1230.c
浏览文件 @ d0be4a7d
...@@ -94,7 +94,7 @@ static volatile unsigned char cmd_buffer[16]; ...@@ -94,7 +94,7 @@ static volatile unsigned char cmd_buffer[16];
*/ */
/***************************************************************** Detection */ /***************************************************************** Detection */
int __init blz1230_esp_detect(Scsi_Host_Template *tpnt) int __init blz1230_esp_detect(struct scsi_host_template *tpnt)
{ {
struct NCR_ESP *esp; struct NCR_ESP *esp;
struct zorro_dev *z = NULL; struct zorro_dev *z = NULL;
...@@ -328,7 +328,7 @@ int blz1230_esp_release(struct Scsi_Host *instance) ...@@ -328,7 +328,7 @@ int blz1230_esp_release(struct Scsi_Host *instance)
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "esp-blz1230", .proc_name = "esp-blz1230",
.proc_info = esp_proc_info, .proc_info = esp_proc_info,
.name = "Blizzard1230 SCSI IV", .name = "Blizzard1230 SCSI IV",
......
drivers/scsi/blz2060.c
浏览文件 @ d0be4a7d
...@@ -90,7 +90,7 @@ static volatile unsigned char cmd_buffer[16]; ...@@ -90,7 +90,7 @@ static volatile unsigned char cmd_buffer[16];
*/ */
/***************************************************************** Detection */ /***************************************************************** Detection */
int __init blz2060_esp_detect(Scsi_Host_Template *tpnt) int __init blz2060_esp_detect(struct scsi_host_template *tpnt)
{ {
struct NCR_ESP *esp; struct NCR_ESP *esp;
struct zorro_dev *z = NULL; struct zorro_dev *z = NULL;
...@@ -282,7 +282,7 @@ int blz2060_esp_release(struct Scsi_Host *instance) ...@@ -282,7 +282,7 @@ int blz2060_esp_release(struct Scsi_Host *instance)
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "esp-blz2060", .proc_name = "esp-blz2060",
.proc_info = esp_proc_info, .proc_info = esp_proc_info,
.name = "Blizzard2060 SCSI", .name = "Blizzard2060 SCSI",
......
drivers/scsi/bvme6000.c
浏览文件 @ d0be4a7d
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include<linux/stat.h> #include<linux/stat.h>
int bvme6000_scsi_detect(Scsi_Host_Template *tpnt) int bvme6000_scsi_detect(struct scsi_host_template *tpnt)
{ {
static unsigned char called = 0; static unsigned char called = 0;
int clock; int clock;
...@@ -60,7 +60,7 @@ static int bvme6000_scsi_release(struct Scsi_Host *shost) ...@@ -60,7 +60,7 @@ static int bvme6000_scsi_release(struct Scsi_Host *shost)
return 0; return 0;
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.name = "BVME6000 NCR53c710 SCSI", .name = "BVME6000 NCR53c710 SCSI",
.detect = bvme6000_scsi_detect, .detect = bvme6000_scsi_detect,
.release = bvme6000_scsi_release, .release = bvme6000_scsi_release,
......
drivers/scsi/bvme6000.h
浏览文件 @ d0be4a7d
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <linux/types.h> #include <linux/types.h>
int bvme6000_scsi_detect(Scsi_Host_Template *); int bvme6000_scsi_detect(struct scsi_host_template *);
const char *NCR53c7x0_info(void); const char *NCR53c7x0_info(void);
int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
int NCR53c7xx_abort(Scsi_Cmnd *); int NCR53c7xx_abort(Scsi_Cmnd *);
......
drivers/scsi/cyberstorm.c
浏览文件 @ d0be4a7d
...@@ -104,7 +104,7 @@ static volatile unsigned char cmd_buffer[16]; ...@@ -104,7 +104,7 @@ static volatile unsigned char cmd_buffer[16];
*/ */
/***************************************************************** Detection */ /***************************************************************** Detection */
int __init cyber_esp_detect(Scsi_Host_Template *tpnt) int __init cyber_esp_detect(struct scsi_host_template *tpnt)
{ {
struct NCR_ESP *esp; struct NCR_ESP *esp;
struct zorro_dev *z = NULL; struct zorro_dev *z = NULL;
...@@ -353,7 +353,7 @@ int cyber_esp_release(struct Scsi_Host *instance) ...@@ -353,7 +353,7 @@ int cyber_esp_release(struct Scsi_Host *instance)
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "esp-cyberstorm", .proc_name = "esp-cyberstorm",
.proc_info = esp_proc_info, .proc_info = esp_proc_info,
.name = "CyberStorm SCSI", .name = "CyberStorm SCSI",
......
drivers/scsi/cyberstormII.c
浏览文件 @ d0be4a7d
...@@ -81,7 +81,7 @@ static volatile unsigned char cmd_buffer[16]; ...@@ -81,7 +81,7 @@ static volatile unsigned char cmd_buffer[16];
*/ */
/***************************************************************** Detection */ /***************************************************************** Detection */
int __init cyberII_esp_detect(Scsi_Host_Template *tpnt) int __init cyberII_esp_detect(struct scsi_host_template *tpnt)
{ {
struct NCR_ESP *esp; struct NCR_ESP *esp;
struct zorro_dev *z = NULL; struct zorro_dev *z = NULL;
...@@ -290,7 +290,7 @@ int cyberII_esp_release(struct Scsi_Host *instance) ...@@ -290,7 +290,7 @@ int cyberII_esp_release(struct Scsi_Host *instance)
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "esp-cyberstormII", .proc_name = "esp-cyberstormII",
.proc_info = esp_proc_info, .proc_info = esp_proc_info,
.name = "CyberStorm Mk II SCSI", .name = "CyberStorm Mk II SCSI",
......
drivers/scsi/dec_esp.c
浏览文件 @ d0be4a7d
...@@ -133,7 +133,7 @@ static struct scsi_host_template driver_template = { ...@@ -133,7 +133,7 @@ static struct scsi_host_template driver_template = {
#include "scsi_module.c" #include "scsi_module.c"
/***************************************************************** Detection */ /***************************************************************** Detection */
static int dec_esp_detect(Scsi_Host_Template * tpnt) static int dec_esp_detect(struct scsi_host_template * tpnt)
{ {
struct NCR_ESP *esp; struct NCR_ESP *esp;
struct ConfigDev *esp_dev; struct ConfigDev *esp_dev;
......
drivers/scsi/dpti.h
浏览文件 @ d0be4a7d
...@@ -44,7 +44,7 @@ static int adpt_device_reset(struct scsi_cmnd* cmd); ...@@ -44,7 +44,7 @@ static int adpt_device_reset(struct scsi_cmnd* cmd);
/* /*
* Scsi_Host_Template (see hosts.h) * struct scsi_host_template (see hosts.h)
*/ */
#define DPT_DRIVER_NAME "Adaptec I2O RAID" #define DPT_DRIVER_NAME "Adaptec I2O RAID"
......
drivers/scsi/dtc.c
浏览文件 @ d0be4a7d
...@@ -199,7 +199,7 @@ static void __init dtc_setup(char *str, int *ints) ...@@ -199,7 +199,7 @@ static void __init dtc_setup(char *str, int *ints)
#endif #endif
/* /*
* Function : int dtc_detect(Scsi_Host_Template * tpnt) * Function : int dtc_detect(struct scsi_host_template * tpnt)
* *
* Purpose : detects and initializes DTC 3180/3280 controllers * Purpose : detects and initializes DTC 3180/3280 controllers
* that were autoprobed, overridden on the LILO command line, * that were autoprobed, overridden on the LILO command line,
...@@ -211,7 +211,7 @@ static void __init dtc_setup(char *str, int *ints) ...@@ -211,7 +211,7 @@ static void __init dtc_setup(char *str, int *ints)
* *
*/ */
static int __init dtc_detect(Scsi_Host_Template * tpnt) static int __init dtc_detect(struct scsi_host_template * tpnt)
{ {
static int current_override = 0, current_base = 0; static int current_override = 0, current_base = 0;
struct Scsi_Host *instance; struct Scsi_Host *instance;
...@@ -471,7 +471,7 @@ static int dtc_release(struct Scsi_Host *shost) ...@@ -471,7 +471,7 @@ static int dtc_release(struct Scsi_Host *shost)
return 0; return 0;
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.name = "DTC 3180/3280 ", .name = "DTC 3180/3280 ",
.detect = dtc_detect, .detect = dtc_detect,
.release = dtc_release, .release = dtc_release,
......
drivers/scsi/dtc.h
浏览文件 @ d0be4a7d
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
static int dtc_abort(Scsi_Cmnd *); static int dtc_abort(Scsi_Cmnd *);
static int dtc_biosparam(struct scsi_device *, struct block_device *, static int dtc_biosparam(struct scsi_device *, struct block_device *,
sector_t, int*); sector_t, int*);
static int dtc_detect(Scsi_Host_Template *); static int dtc_detect(struct scsi_host_template *);
static int dtc_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int dtc_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
static int dtc_bus_reset(Scsi_Cmnd *); static int dtc_bus_reset(Scsi_Cmnd *);
......
drivers/scsi/fastlane.c
浏览文件 @ d0be4a7d
...@@ -125,7 +125,7 @@ static inline void dma_clear(struct NCR_ESP *esp) ...@@ -125,7 +125,7 @@ static inline void dma_clear(struct NCR_ESP *esp)
} }
/***************************************************************** Detection */ /***************************************************************** Detection */
int __init fastlane_esp_detect(Scsi_Host_Template *tpnt) int __init fastlane_esp_detect(struct scsi_host_template *tpnt)
{ {
struct NCR_ESP *esp; struct NCR_ESP *esp;
struct zorro_dev *z = NULL; struct zorro_dev *z = NULL;
...@@ -398,7 +398,7 @@ int fastlane_esp_release(struct Scsi_Host *instance) ...@@ -398,7 +398,7 @@ int fastlane_esp_release(struct Scsi_Host *instance)
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "esp-fastlane", .proc_name = "esp-fastlane",
.proc_info = esp_proc_info, .proc_info = esp_proc_info,
.name = "Fastlane SCSI", .name = "Fastlane SCSI",
......
drivers/scsi/fcal.c
浏览文件 @ d0be4a7d
...@@ -89,7 +89,7 @@ int fcal_slave_configure(Scsi_Device *device) ...@@ -89,7 +89,7 @@ int fcal_slave_configure(Scsi_Device *device)
/* Detect all FC Arbitrated Loops attached to the machine. /* Detect all FC Arbitrated Loops attached to the machine.
fc4 module has done all the work for us... */ fc4 module has done all the work for us... */
int __init fcal_detect(Scsi_Host_Template *tpnt) int __init fcal_detect(struct scsi_host_template *tpnt)
{ {
int nfcals = 0; int nfcals = 0;
fc_channel *fc; fc_channel *fc;
...@@ -297,7 +297,7 @@ static int fcal_encode_addr(Scsi_Cmnd *SCpnt, u16 *addr, fc_channel *fc, fcp_cmn ...@@ -297,7 +297,7 @@ static int fcal_encode_addr(Scsi_Cmnd *SCpnt, u16 *addr, fc_channel *fc, fcp_cmn
return 0; return 0;
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.name = "Fibre Channel Arbitrated Loop", .name = "Fibre Channel Arbitrated Loop",
.detect = fcal_detect, .detect = fcal_detect,
.release = fcal_release, .release = fcal_release,
......
drivers/scsi/fcal.h
浏览文件 @ d0be4a7d
...@@ -20,7 +20,7 @@ struct fcal { ...@@ -20,7 +20,7 @@ struct fcal {
for a particular channel */ for a particular channel */
#define FCAL_CAN_QUEUE 512 #define FCAL_CAN_QUEUE 512
int fcal_detect(Scsi_Host_Template *); int fcal_detect(struct scsi_host_template *);
int fcal_release(struct Scsi_Host *); int fcal_release(struct Scsi_Host *);
int fcal_slave_configure(Scsi_Device *); int fcal_slave_configure(Scsi_Device *);
......
drivers/scsi/fd_mcs.c
浏览文件 @ d0be4a7d
...@@ -343,7 +343,7 @@ static void fd_mcs_make_bus_idle(struct Scsi_Host *shpnt) ...@@ -343,7 +343,7 @@ static void fd_mcs_make_bus_idle(struct Scsi_Host *shpnt)
outb(0x01 | PARITY_MASK, TMC_Cntl_port); outb(0x01 | PARITY_MASK, TMC_Cntl_port);
} }
static int fd_mcs_detect(Scsi_Host_Template * tpnt) static int fd_mcs_detect(struct scsi_host_template * tpnt)
{ {
int loop; int loop;
struct Scsi_Host *shpnt; struct Scsi_Host *shpnt;
...@@ -1343,7 +1343,7 @@ static int fd_mcs_biosparam(struct scsi_device * disk, struct block_device *bdev ...@@ -1343,7 +1343,7 @@ static int fd_mcs_biosparam(struct scsi_device * disk, struct block_device *bdev
return 0; return 0;
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "fd_mcs", .proc_name = "fd_mcs",
.proc_info = fd_mcs_proc_info, .proc_info = fd_mcs_proc_info,
.detect = fd_mcs_detect, .detect = fd_mcs_detect,
......
drivers/scsi/g_NCR5380.c
浏览文件 @ d0be4a7d
...@@ -285,7 +285,7 @@ static int __init do_DTC3181E_setup(char *str) ...@@ -285,7 +285,7 @@ static int __init do_DTC3181E_setup(char *str)
* Locks: none * Locks: none
*/ */
int __init generic_NCR5380_detect(Scsi_Host_Template * tpnt) int __init generic_NCR5380_detect(struct scsi_host_template * tpnt)
{ {
static int current_override = 0; static int current_override = 0;
int count, i; int count, i;
...@@ -899,7 +899,7 @@ static int generic_NCR5380_proc_info(struct Scsi_Host *scsi_ptr, char *buffer, c ...@@ -899,7 +899,7 @@ static int generic_NCR5380_proc_info(struct Scsi_Host *scsi_ptr, char *buffer, c
#undef PRINTP #undef PRINTP
#undef ANDP #undef ANDP
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_info = generic_NCR5380_proc_info, .proc_info = generic_NCR5380_proc_info,
.name = "Generic NCR5380/NCR53C400 Scsi Driver", .name = "Generic NCR5380/NCR53C400 Scsi Driver",
.detect = generic_NCR5380_detect, .detect = generic_NCR5380_detect,
......
drivers/scsi/g_NCR5380.h
浏览文件 @ d0be4a7d
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#ifndef ASM #ifndef ASM
static int generic_NCR5380_abort(Scsi_Cmnd *); static int generic_NCR5380_abort(Scsi_Cmnd *);
static int generic_NCR5380_detect(Scsi_Host_Template *); static int generic_NCR5380_detect(struct scsi_host_template *);
static int generic_NCR5380_release_resources(struct Scsi_Host *); static int generic_NCR5380_release_resources(struct Scsi_Host *);
static int generic_NCR5380_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int generic_NCR5380_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
static int generic_NCR5380_bus_reset(Scsi_Cmnd *); static int generic_NCR5380_bus_reset(Scsi_Cmnd *);
......
drivers/scsi/gdth.c
浏览文件 @ d0be4a7d
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
* Bugfix free_irq() * Bugfix free_irq()
* *
* Revision 1.56 2001/08/09 11:19:39 achim * Revision 1.56 2001/08/09 11:19:39 achim
* Scsi_Host_Template changes * struct scsi_host_template changes
* *
* Revision 1.55 2001/08/09 10:11:28 achim * Revision 1.55 2001/08/09 10:11:28 achim
* Command HOST_UNFREEZE_IO before cache service init. * Command HOST_UNFREEZE_IO before cache service init.
...@@ -4153,7 +4153,7 @@ int __init option_setup(char *str) ...@@ -4153,7 +4153,7 @@ int __init option_setup(char *str)
return 1; return 1;
} }
static int __init gdth_detect(Scsi_Host_Template *shtp) static int __init gdth_detect(struct scsi_host_template *shtp)
{ {
struct Scsi_Host *shp; struct Scsi_Host *shp;
gdth_pci_str pcistr[MAXHA]; gdth_pci_str pcistr[MAXHA];
...@@ -5683,7 +5683,7 @@ static int gdth_halt(struct notifier_block *nb, ulong event, void *buf) ...@@ -5683,7 +5683,7 @@ static int gdth_halt(struct notifier_block *nb, ulong event, void *buf)
return NOTIFY_OK; return NOTIFY_OK;
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "gdth", .proc_name = "gdth",
.proc_info = gdth_proc_info, .proc_info = gdth_proc_info,
.name = "GDT SCSI Disk Array Controller", .name = "GDT SCSI Disk Array Controller",
......
drivers/scsi/gvp11.c
浏览文件 @ d0be4a7d
...@@ -170,7 +170,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, ...@@ -170,7 +170,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
#define CHECK_WD33C93 #define CHECK_WD33C93
int __init gvp11_detect(Scsi_Host_Template *tpnt) int __init gvp11_detect(struct scsi_host_template *tpnt)
{ {
static unsigned char called = 0; static unsigned char called = 0;
struct Scsi_Host *instance; struct Scsi_Host *instance;
...@@ -362,7 +362,7 @@ static int gvp11_bus_reset(Scsi_Cmnd *cmd) ...@@ -362,7 +362,7 @@ static int gvp11_bus_reset(Scsi_Cmnd *cmd)
#include "gvp11.h" #include "gvp11.h"
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "GVP11", .proc_name = "GVP11",
.name = "GVP Series II SCSI", .name = "GVP Series II SCSI",
.detect = gvp11_detect, .detect = gvp11_detect,
......
drivers/scsi/gvp11.h
浏览文件 @ d0be4a7d
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/types.h> #include <linux/types.h>
int gvp11_detect(Scsi_Host_Template *); int gvp11_detect(struct scsi_host_template *);
int gvp11_release(struct Scsi_Host *); int gvp11_release(struct Scsi_Host *);
const char *wd33c93_info(void); const char *wd33c93_info(void);
int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
......
drivers/scsi/ibmmca.c
浏览文件 @ d0be4a7d
...@@ -498,7 +498,7 @@ static char *ibmrate(unsigned int, int); ...@@ -498,7 +498,7 @@ static char *ibmrate(unsigned int, int);
static int probe_display(int); static int probe_display(int);
static int probe_bus_mode(int); static int probe_bus_mode(int);
static int device_exists(int, int, int *, int *); static int device_exists(int, int, int *, int *);
static struct Scsi_Host *ibmmca_register(Scsi_Host_Template *, int, int, int, char *); static struct Scsi_Host *ibmmca_register(struct scsi_host_template *, int, int, int, char *);
static int option_setup(char *); static int option_setup(char *);
/* local functions needed for proc_info */ /* local functions needed for proc_info */
static int ldn_access_load(int, int); static int ldn_access_load(int, int);
...@@ -1489,7 +1489,7 @@ static int ibmmca_getinfo(char *buf, int slot, void *dev_id) ...@@ -1489,7 +1489,7 @@ static int ibmmca_getinfo(char *buf, int slot, void *dev_id)
return len; return len;
} }
int ibmmca_detect(Scsi_Host_Template * scsi_template) int ibmmca_detect(struct scsi_host_template * scsi_template)
{ {
struct Scsi_Host *shpnt; struct Scsi_Host *shpnt;
int port, id, i, j, k, list_size, slot; int port, id, i, j, k, list_size, slot;
...@@ -1742,7 +1742,7 @@ int ibmmca_detect(Scsi_Host_Template * scsi_template) ...@@ -1742,7 +1742,7 @@ int ibmmca_detect(Scsi_Host_Template * scsi_template)
return found; /* return the number of found SCSI hosts. Should be 1 or 0. */ return found; /* return the number of found SCSI hosts. Should be 1 or 0. */
} }
static struct Scsi_Host *ibmmca_register(Scsi_Host_Template * scsi_template, int port, int id, int adaptertype, char *hostname) static struct Scsi_Host *ibmmca_register(struct scsi_host_template * scsi_template, int port, int id, int adaptertype, char *hostname)
{ {
struct Scsi_Host *shpnt; struct Scsi_Host *shpnt;
int i, j; int i, j;
...@@ -2500,7 +2500,7 @@ static int option_setup(char *str) ...@@ -2500,7 +2500,7 @@ static int option_setup(char *str)
__setup("ibmmcascsi=", option_setup); __setup("ibmmcascsi=", option_setup);
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "ibmmca", .proc_name = "ibmmca",
.proc_info = ibmmca_proc_info, .proc_info = ibmmca_proc_info,
.name = "IBM SCSI-Subsystem", .name = "IBM SCSI-Subsystem",
......
drivers/scsi/ibmmca.h
浏览文件 @ d0be4a7d
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
/* Common forward declarations for all Linux-versions: */ /* Common forward declarations for all Linux-versions: */
/* Interfaces to the midlevel Linux SCSI driver */ /* Interfaces to the midlevel Linux SCSI driver */
static int ibmmca_detect (Scsi_Host_Template *); static int ibmmca_detect (struct scsi_host_template *);
static int ibmmca_release (struct Scsi_Host *); static int ibmmca_release (struct Scsi_Host *);
static int ibmmca_queuecommand (Scsi_Cmnd *, void (*done) (Scsi_Cmnd *)); static int ibmmca_queuecommand (Scsi_Cmnd *, void (*done) (Scsi_Cmnd *));
static int ibmmca_abort (Scsi_Cmnd *); static int ibmmca_abort (Scsi_Cmnd *);
......
drivers/scsi/in2000.c
浏览文件 @ d0be4a7d
...@@ -1899,7 +1899,7 @@ static int int_tab[] in2000__INITDATA = { ...@@ -1899,7 +1899,7 @@ static int int_tab[] in2000__INITDATA = {
}; };
static int __init in2000_detect(Scsi_Host_Template * tpnt) static int __init in2000_detect(struct scsi_host_template * tpnt)
{ {
struct Scsi_Host *instance; struct Scsi_Host *instance;
struct IN2000_hostdata *hostdata; struct IN2000_hostdata *hostdata;
...@@ -2305,7 +2305,7 @@ static int in2000_proc_info(struct Scsi_Host *instance, char *buf, char **start, ...@@ -2305,7 +2305,7 @@ static int in2000_proc_info(struct Scsi_Host *instance, char *buf, char **start,
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "in2000", .proc_name = "in2000",
.proc_info = in2000_proc_info, .proc_info = in2000_proc_info,
.name = "Always IN2000", .name = "Always IN2000",
......
drivers/scsi/in2000.h
浏览文件 @ d0be4a7d
...@@ -395,7 +395,7 @@ struct IN2000_hostdata { ...@@ -395,7 +395,7 @@ struct IN2000_hostdata {
# define CLISPIN_UNLOCK(host,flags) spin_unlock_irqrestore(host->host_lock, \ # define CLISPIN_UNLOCK(host,flags) spin_unlock_irqrestore(host->host_lock, \
flags) flags)
static int in2000_detect(Scsi_Host_Template *) in2000__INIT; static int in2000_detect(struct scsi_host_template *) in2000__INIT;
static int in2000_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int in2000_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
static int in2000_abort(Scsi_Cmnd *); static int in2000_abort(Scsi_Cmnd *);
static void in2000_setup(char *, int *) in2000__INIT; static void in2000_setup(char *, int *) in2000__INIT;
......
drivers/scsi/ips.c
浏览文件 @ d0be4a7d
...@@ -248,7 +248,7 @@ module_param(ips, charp, 0); ...@@ -248,7 +248,7 @@ module_param(ips, charp, 0);
/* /*
* Function prototypes * Function prototypes
*/ */
static int ips_detect(Scsi_Host_Template *); static int ips_detect(struct scsi_host_template *);
static int ips_release(struct Scsi_Host *); static int ips_release(struct Scsi_Host *);
static int ips_eh_abort(Scsi_Cmnd *); static int ips_eh_abort(Scsi_Cmnd *);
static int ips_eh_reset(Scsi_Cmnd *); static int ips_eh_reset(Scsi_Cmnd *);
...@@ -377,7 +377,7 @@ static char *ips_FlashData = NULL; /* CD Boot - Flash Data Buffer */ ...@@ -377,7 +377,7 @@ static char *ips_FlashData = NULL; /* CD Boot - Flash Data Buffer */
static dma_addr_t ips_flashbusaddr; static dma_addr_t ips_flashbusaddr;
static long ips_FlashDataInUse; /* CD Boot - Flash Data In Use Flag */ static long ips_FlashDataInUse; /* CD Boot - Flash Data In Use Flag */
static uint32_t MaxLiteCmds = 32; /* Max Active Cmds for a Lite Adapter */ static uint32_t MaxLiteCmds = 32; /* Max Active Cmds for a Lite Adapter */
static Scsi_Host_Template ips_driver_template = { static struct scsi_host_template ips_driver_template = {
.detect = ips_detect, .detect = ips_detect,
.release = ips_release, .release = ips_release,
.info = ips_info, .info = ips_info,
...@@ -587,7 +587,7 @@ __setup("ips=", ips_setup); ...@@ -587,7 +587,7 @@ __setup("ips=", ips_setup);
/* */ /* */
/****************************************************************************/ /****************************************************************************/
static int static int
ips_detect(Scsi_Host_Template * SHT) ips_detect(struct scsi_host_template * SHT)
{ {
int i; int i;
......
drivers/scsi/jazz_esp.c
浏览文件 @ d0be4a7d
...@@ -52,7 +52,7 @@ static volatile unsigned char cmd_buffer[16]; ...@@ -52,7 +52,7 @@ static volatile unsigned char cmd_buffer[16];
* via PIO. * via PIO.
*/ */
int jazz_esp_detect(Scsi_Host_Template *tpnt); int jazz_esp_detect(struct scsi_host_template *tpnt);
static int jazz_esp_release(struct Scsi_Host *shost) static int jazz_esp_release(struct Scsi_Host *shost)
{ {
if (shost->irq) if (shost->irq)
...@@ -65,7 +65,7 @@ static int jazz_esp_release(struct Scsi_Host *shost) ...@@ -65,7 +65,7 @@ static int jazz_esp_release(struct Scsi_Host *shost)
return 0; return 0;
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "jazz_esp", .proc_name = "jazz_esp",
.proc_info = &esp_proc_info, .proc_info = &esp_proc_info,
.name = "ESP 100/100a/200", .name = "ESP 100/100a/200",
......
drivers/scsi/mac_esp.c
浏览文件 @ d0be4a7d
...@@ -300,7 +300,7 @@ unsigned long get_base(int chip_num) ...@@ -300,7 +300,7 @@ unsigned long get_base(int chip_num)
* Model dependent ESP setup * Model dependent ESP setup
*/ */
int mac_esp_detect(Scsi_Host_Template * tpnt) int mac_esp_detect(struct scsi_host_template * tpnt)
{ {
int quick = 0; int quick = 0;
int chipnum, chipspresent = 0; int chipnum, chipspresent = 0;
...@@ -730,7 +730,7 @@ static void dma_setup_quick(struct NCR_ESP * esp, __u32 addr, int count, int wri ...@@ -730,7 +730,7 @@ static void dma_setup_quick(struct NCR_ESP * esp, __u32 addr, int count, int wri
#endif #endif
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "mac_esp", .proc_name = "mac_esp",
.name = "Mac 53C9x SCSI", .name = "Mac 53C9x SCSI",
.detect = mac_esp_detect, .detect = mac_esp_detect,
......
drivers/scsi/mac_scsi.c
浏览文件 @ d0be4a7d
...@@ -222,7 +222,7 @@ static struct Scsi_Host *default_instance; ...@@ -222,7 +222,7 @@ static struct Scsi_Host *default_instance;
#endif #endif
/* /*
* Function : int macscsi_detect(Scsi_Host_Template * tpnt) * Function : int macscsi_detect(struct scsi_host_template * tpnt)
* *
* Purpose : initializes mac NCR5380 driver based on the * Purpose : initializes mac NCR5380 driver based on the
* command line / compile time port and irq definitions. * command line / compile time port and irq definitions.
...@@ -233,7 +233,7 @@ static struct Scsi_Host *default_instance; ...@@ -233,7 +233,7 @@ static struct Scsi_Host *default_instance;
* *
*/ */
int macscsi_detect(Scsi_Host_Template * tpnt) int macscsi_detect(struct scsi_host_template * tpnt)
{ {
static int called = 0; static int called = 0;
int flags = 0; int flags = 0;
...@@ -581,7 +581,7 @@ static int macscsi_pwrite (struct Scsi_Host *instance, ...@@ -581,7 +581,7 @@ static int macscsi_pwrite (struct Scsi_Host *instance,
#include "NCR5380.c" #include "NCR5380.c"
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "Mac5380", .proc_name = "Mac5380",
.proc_info = macscsi_proc_info, .proc_info = macscsi_proc_info,
.name = "Macintosh NCR5380 SCSI", .name = "Macintosh NCR5380 SCSI",
......
drivers/scsi/mca_53c9x.c
浏览文件 @ d0be4a7d
...@@ -103,7 +103,7 @@ static volatile unsigned char cmd_buffer[16]; ...@@ -103,7 +103,7 @@ static volatile unsigned char cmd_buffer[16];
static struct ESP_regs eregs; static struct ESP_regs eregs;
/***************************************************************** Detection */ /***************************************************************** Detection */
static int mca_esp_detect(Scsi_Host_Template *tpnt) static int mca_esp_detect(struct scsi_host_template *tpnt)
{ {
struct NCR_ESP *esp; struct NCR_ESP *esp;
static int io_port_by_pos[] = MCA_53C9X_IO_PORTS; static int io_port_by_pos[] = MCA_53C9X_IO_PORTS;
...@@ -444,7 +444,7 @@ static void dma_led_off(struct NCR_ESP *esp) ...@@ -444,7 +444,7 @@ static void dma_led_off(struct NCR_ESP *esp)
outb(inb(PS2_SYS_CTR) & 0x3f, PS2_SYS_CTR); outb(inb(PS2_SYS_CTR) & 0x3f, PS2_SYS_CTR);
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "mca_53c9x", .proc_name = "mca_53c9x",
.name = "NCR 53c9x SCSI", .name = "NCR 53c9x SCSI",
.detect = mca_esp_detect, .detect = mca_esp_detect,
......
drivers/scsi/mvme147.c
浏览文件 @ d0be4a7d
...@@ -64,7 +64,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, ...@@ -64,7 +64,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
m147_pcc->dma_cntrl = 0; m147_pcc->dma_cntrl = 0;
} }
int mvme147_detect(Scsi_Host_Template *tpnt) int mvme147_detect(struct scsi_host_template *tpnt)
{ {
static unsigned char called = 0; static unsigned char called = 0;
wd33c93_regs regs; wd33c93_regs regs;
...@@ -131,7 +131,7 @@ static int mvme147_bus_reset(Scsi_Cmnd *cmd) ...@@ -131,7 +131,7 @@ static int mvme147_bus_reset(Scsi_Cmnd *cmd)
#include "mvme147.h" #include "mvme147.h"
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "MVME147", .proc_name = "MVME147",
.name = "MVME147 built-in SCSI", .name = "MVME147 built-in SCSI",
.detect = mvme147_detect, .detect = mvme147_detect,
......
drivers/scsi/mvme147.h
浏览文件 @ d0be4a7d
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <linux/types.h> #include <linux/types.h>
int mvme147_detect(Scsi_Host_Template *); int mvme147_detect(struct scsi_host_template *);
int mvme147_release(struct Scsi_Host *); int mvme147_release(struct Scsi_Host *);
const char *wd33c93_info(void); const char *wd33c93_info(void);
int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
......
drivers/scsi/mvme16x.c
浏览文件 @ d0be4a7d
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include<linux/stat.h> #include<linux/stat.h>
int mvme16x_scsi_detect(Scsi_Host_Template *tpnt) int mvme16x_scsi_detect(struct scsi_host_template *tpnt)
{ {
static unsigned char called = 0; static unsigned char called = 0;
int clock; int clock;
...@@ -62,7 +62,7 @@ static int mvme16x_scsi_release(struct Scsi_Host *shost) ...@@ -62,7 +62,7 @@ static int mvme16x_scsi_release(struct Scsi_Host *shost)
return 0; return 0;
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.name = "MVME16x NCR53c710 SCSI", .name = "MVME16x NCR53c710 SCSI",
.detect = mvme16x_scsi_detect, .detect = mvme16x_scsi_detect,
.release = mvme16x_scsi_release, .release = mvme16x_scsi_release,
......
drivers/scsi/mvme16x.h
浏览文件 @ d0be4a7d
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <linux/types.h> #include <linux/types.h>
int mvme16x_scsi_detect(Scsi_Host_Template *); int mvme16x_scsi_detect(struct scsi_host_template *);
const char *NCR53c7x0_info(void); const char *NCR53c7x0_info(void);
int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); int NCR53c7xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
int NCR53c7xx_abort(Scsi_Cmnd *); int NCR53c7xx_abort(Scsi_Cmnd *);
......
drivers/scsi/nsp32.c
浏览文件 @ d0be4a7d
...@@ -198,7 +198,7 @@ static void __devexit nsp32_remove(struct pci_dev *); ...@@ -198,7 +198,7 @@ static void __devexit nsp32_remove(struct pci_dev *);
static int __init init_nsp32 (void); static int __init init_nsp32 (void);
static void __exit exit_nsp32 (void); static void __exit exit_nsp32 (void);
/* struct Scsi_Host_Template */ /* struct struct scsi_host_template */
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
static int nsp32_proc_info (struct Scsi_Host *, char *, char **, off_t, int, int); static int nsp32_proc_info (struct Scsi_Host *, char *, char **, off_t, int, int);
#else #else
...@@ -208,7 +208,7 @@ static int nsp32_proc_info (char *, char **, off_t, int, int, int); ...@@ -208,7 +208,7 @@ static int nsp32_proc_info (char *, char **, off_t, int, int, int);
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
static int nsp32_detect (struct pci_dev *pdev); static int nsp32_detect (struct pci_dev *pdev);
#else #else
static int nsp32_detect (Scsi_Host_Template *); static int nsp32_detect (struct scsi_host_template *);
#endif #endif
static int nsp32_queuecommand(struct scsi_cmnd *, static int nsp32_queuecommand(struct scsi_cmnd *,
void (*done)(struct scsi_cmnd *)); void (*done)(struct scsi_cmnd *));
...@@ -2683,7 +2683,7 @@ static int nsp32_detect(struct pci_dev *pdev) ...@@ -2683,7 +2683,7 @@ static int nsp32_detect(struct pci_dev *pdev)
#define DETECT_OK 1 #define DETECT_OK 1
#define DETECT_NG 0 #define DETECT_NG 0
#define PCIDEV (data->Pci) #define PCIDEV (data->Pci)
static int nsp32_detect(Scsi_Host_Template *sht) static int nsp32_detect(struct scsi_host_template *sht)
#endif #endif
{ {
struct Scsi_Host *host; /* registered host structure */ struct Scsi_Host *host; /* registered host structure */
......
drivers/scsi/oktagon_esp.c
浏览文件 @ d0be4a7d
...@@ -114,7 +114,7 @@ static volatile unsigned char cmd_buffer[16]; ...@@ -114,7 +114,7 @@ static volatile unsigned char cmd_buffer[16];
*/ */
/***************************************************************** Detection */ /***************************************************************** Detection */
int oktagon_esp_detect(Scsi_Host_Template *tpnt) int oktagon_esp_detect(struct scsi_host_template *tpnt)
{ {
struct NCR_ESP *esp; struct NCR_ESP *esp;
struct zorro_dev *z = NULL; struct zorro_dev *z = NULL;
...@@ -585,7 +585,7 @@ int oktagon_esp_release(struct Scsi_Host *instance) ...@@ -585,7 +585,7 @@ int oktagon_esp_release(struct Scsi_Host *instance)
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "esp-oktagon", .proc_name = "esp-oktagon",
.proc_info = &esp_proc_info, .proc_info = &esp_proc_info,
.name = "BSC Oktagon SCSI", .name = "BSC Oktagon SCSI",
......
drivers/scsi/pas16.c
浏览文件 @ d0be4a7d
...@@ -369,7 +369,7 @@ void __init pas16_setup(char *str, int *ints) ...@@ -369,7 +369,7 @@ void __init pas16_setup(char *str, int *ints)
} }
/* /*
* Function : int pas16_detect(Scsi_Host_Template * tpnt) * Function : int pas16_detect(struct scsi_host_template * tpnt)
* *
* Purpose : detects and initializes PAS16 controllers * Purpose : detects and initializes PAS16 controllers
* that were autoprobed, overridden on the LILO command line, * that were autoprobed, overridden on the LILO command line,
...@@ -381,7 +381,7 @@ void __init pas16_setup(char *str, int *ints) ...@@ -381,7 +381,7 @@ void __init pas16_setup(char *str, int *ints)
* *
*/ */
int __init pas16_detect(Scsi_Host_Template * tpnt) int __init pas16_detect(struct scsi_host_template * tpnt)
{ {
static int current_override = 0; static int current_override = 0;
static unsigned short current_base = 0; static unsigned short current_base = 0;
...@@ -615,7 +615,7 @@ static int pas16_release(struct Scsi_Host *shost) ...@@ -615,7 +615,7 @@ static int pas16_release(struct Scsi_Host *shost)
return 0; return 0;
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.name = "Pro Audio Spectrum-16 SCSI", .name = "Pro Audio Spectrum-16 SCSI",
.detect = pas16_detect, .detect = pas16_detect,
.release = pas16_release, .release = pas16_release,
......
drivers/scsi/pas16.h
浏览文件 @ d0be4a7d
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
static int pas16_abort(Scsi_Cmnd *); static int pas16_abort(Scsi_Cmnd *);
static int pas16_biosparam(struct scsi_device *, struct block_device *, static int pas16_biosparam(struct scsi_device *, struct block_device *,
sector_t, int*); sector_t, int*);
static int pas16_detect(Scsi_Host_Template *); static int pas16_detect(struct scsi_host_template *);
static int pas16_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int pas16_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
static int pas16_bus_reset(Scsi_Cmnd *); static int pas16_bus_reset(Scsi_Cmnd *);
......
drivers/scsi/pci2000.h
浏览文件 @ d0be4a7d
...@@ -187,7 +187,7 @@ typedef struct _INQUIRYDATA ...@@ -187,7 +187,7 @@ typedef struct _INQUIRYDATA
#endif #endif
// function prototypes // function prototypes
int Pci2000_Detect (Scsi_Host_Template *tpnt); int Pci2000_Detect (struct scsi_host_template *tpnt);
int Pci2000_Command (Scsi_Cmnd *SCpnt); int Pci2000_Command (Scsi_Cmnd *SCpnt);
int Pci2000_QueueCommand (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *)); int Pci2000_QueueCommand (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *));
int Pci2000_Abort (Scsi_Cmnd *SCpnt); int Pci2000_Abort (Scsi_Cmnd *SCpnt);
......
drivers/scsi/pcmcia/nsp_cs.c
浏览文件 @ d0be4a7d
...@@ -81,7 +81,7 @@ module_param(free_ports, bool, 0); ...@@ -81,7 +81,7 @@ module_param(free_ports, bool, 0);
MODULE_PARM_DESC(free_ports, "Release IO ports after configuration? (default: 0 (=no))"); MODULE_PARM_DESC(free_ports, "Release IO ports after configuration? (default: 0 (=no))");
/* /usr/src/linux/drivers/scsi/hosts.h */ /* /usr/src/linux/drivers/scsi/hosts.h */
static Scsi_Host_Template nsp_driver_template = { static struct scsi_host_template nsp_driver_template = {
.proc_name = "nsp_cs", .proc_name = "nsp_cs",
.proc_info = nsp_proc_info, .proc_info = nsp_proc_info,
.name = "WorkBit NinjaSCSI-3/32Bi(16bit)", .name = "WorkBit NinjaSCSI-3/32Bi(16bit)",
...@@ -1310,7 +1310,7 @@ static irqreturn_t nspintr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1310,7 +1310,7 @@ static irqreturn_t nspintr(int irq, void *dev_id, struct pt_regs *regs)
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
/* look for ninja3 card and init if found */ /* look for ninja3 card and init if found */
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
static struct Scsi_Host *nsp_detect(Scsi_Host_Template *sht) static struct Scsi_Host *nsp_detect(struct scsi_host_template *sht)
{ {
struct Scsi_Host *host; /* registered host structure */ struct Scsi_Host *host; /* registered host structure */
nsp_hw_data *data_b = &nsp_data_base, *data; nsp_hw_data *data_b = &nsp_data_base, *data;
...@@ -1358,7 +1358,7 @@ static struct Scsi_Host *nsp_detect(Scsi_Host_Template *sht) ...@@ -1358,7 +1358,7 @@ static struct Scsi_Host *nsp_detect(Scsi_Host_Template *sht)
} }
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
static int nsp_detect_old(Scsi_Host_Template *sht) static int nsp_detect_old(struct scsi_host_template *sht)
{ {
if (nsp_detect(sht) == NULL) { if (nsp_detect(sht) == NULL) {
return 0; return 0;
......
drivers/scsi/pcmcia/nsp_cs.h
浏览文件 @ d0be4a7d
...@@ -303,9 +303,9 @@ static void nsp_cs_config (dev_link_t *link); ...@@ -303,9 +303,9 @@ static void nsp_cs_config (dev_link_t *link);
static int nsp_cs_event (event_t event, int priority, event_callback_args_t *args); static int nsp_cs_event (event_t event, int priority, event_callback_args_t *args);
/* Linux SCSI subsystem specific functions */ /* Linux SCSI subsystem specific functions */
static struct Scsi_Host *nsp_detect (Scsi_Host_Template *sht); static struct Scsi_Host *nsp_detect (struct scsi_host_template *sht);
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
static int nsp_detect_old (Scsi_Host_Template *sht); static int nsp_detect_old (struct scsi_host_template *sht);
static int nsp_release_old(struct Scsi_Host *shpnt); static int nsp_release_old(struct Scsi_Host *shpnt);
#endif #endif
static const char *nsp_info (struct Scsi_Host *shpnt); static const char *nsp_info (struct Scsi_Host *shpnt);
...@@ -345,7 +345,7 @@ static int nsp_expect_signal (Scsi_Cmnd *SCpnt, unsigned char current_phase, ...@@ -345,7 +345,7 @@ static int nsp_expect_signal (Scsi_Cmnd *SCpnt, unsigned char current_phase,
static int nsp_xfer (Scsi_Cmnd *SCpnt, int phase); static int nsp_xfer (Scsi_Cmnd *SCpnt, int phase);
static int nsp_dataphase_bypass (Scsi_Cmnd *SCpnt); static int nsp_dataphase_bypass (Scsi_Cmnd *SCpnt);
static int nsp_reselected (Scsi_Cmnd *SCpnt); static int nsp_reselected (Scsi_Cmnd *SCpnt);
static struct Scsi_Host *nsp_detect(Scsi_Host_Template *sht); static struct Scsi_Host *nsp_detect(struct scsi_host_template *sht);
/* Interrupt handler */ /* Interrupt handler */
//static irqreturn_t nspintr(int irq, void *dev_id, struct pt_regs *regs); //static irqreturn_t nspintr(int irq, void *dev_id, struct pt_regs *regs);
......
drivers/scsi/pcmcia/qlogic_stub.c
浏览文件 @ d0be4a7d
...@@ -72,7 +72,7 @@ static char *version = "qlogic_cs.c 1.79-ac 2002/10/26 (David Hinds)"; ...@@ -72,7 +72,7 @@ static char *version = "qlogic_cs.c 1.79-ac 2002/10/26 (David Hinds)";
#define DEBUG(n, args...) #define DEBUG(n, args...)
#endif #endif
static Scsi_Host_Template qlogicfas_driver_template = { static struct scsi_host_template qlogicfas_driver_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = qlogic_name, .name = qlogic_name,
.proc_name = qlogic_name, .proc_name = qlogic_name,
...@@ -108,7 +108,7 @@ static dev_link_t *dev_list = NULL; ...@@ -108,7 +108,7 @@ static dev_link_t *dev_list = NULL;
static dev_info_t dev_info = "qlogic_cs"; static dev_info_t dev_info = "qlogic_cs";
static struct Scsi_Host *qlogic_detect(Scsi_Host_Template *host, static struct Scsi_Host *qlogic_detect(struct scsi_host_template *host,
dev_link_t *link, int qbase, int qlirq) dev_link_t *link, int qbase, int qlirq)
{ {
int qltyp; /* type of chip */ int qltyp; /* type of chip */
......
drivers/scsi/pdc_adma.c
浏览文件 @ d0be4a7d
...@@ -139,7 +139,7 @@ static u8 adma_bmdma_status(struct ata_port *ap); ...@@ -139,7 +139,7 @@ static u8 adma_bmdma_status(struct ata_port *ap);
static void adma_irq_clear(struct ata_port *ap); static void adma_irq_clear(struct ata_port *ap);
static void adma_eng_timeout(struct ata_port *ap); static void adma_eng_timeout(struct ata_port *ap);
static Scsi_Host_Template adma_ata_sht = { static struct scsi_host_template adma_ata_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/pluto.c
浏览文件 @ d0be4a7d
...@@ -90,7 +90,7 @@ int pluto_slave_configure(Scsi_Device *device) ...@@ -90,7 +90,7 @@ int pluto_slave_configure(Scsi_Device *device)
/* Detect all SSAs attached to the machine. /* Detect all SSAs attached to the machine.
To be fast, do it on all online FC channels at the same time. */ To be fast, do it on all online FC channels at the same time. */
int __init pluto_detect(Scsi_Host_Template *tpnt) int __init pluto_detect(struct scsi_host_template *tpnt)
{ {
int i, retry, nplutos; int i, retry, nplutos;
fc_channel *fc; fc_channel *fc;
...@@ -339,7 +339,7 @@ static int pluto_encode_addr(Scsi_Cmnd *SCpnt, u16 *addr, fc_channel *fc, fcp_cm ...@@ -339,7 +339,7 @@ static int pluto_encode_addr(Scsi_Cmnd *SCpnt, u16 *addr, fc_channel *fc, fcp_cm
return 0; return 0;
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.name = "Sparc Storage Array 100/200", .name = "Sparc Storage Array 100/200",
.detect = pluto_detect, .detect = pluto_detect,
.release = pluto_release, .release = pluto_release,
......
drivers/scsi/pluto.h
浏览文件 @ d0be4a7d
...@@ -38,7 +38,7 @@ struct pluto_inquiry { ...@@ -38,7 +38,7 @@ struct pluto_inquiry {
/* This is the max number of outstanding SCSI commands per pluto */ /* This is the max number of outstanding SCSI commands per pluto */
#define PLUTO_CAN_QUEUE 254 #define PLUTO_CAN_QUEUE 254
int pluto_detect(Scsi_Host_Template *); int pluto_detect(struct scsi_host_template *);
int pluto_release(struct Scsi_Host *); int pluto_release(struct Scsi_Host *);
const char * pluto_info(struct Scsi_Host *); const char * pluto_info(struct Scsi_Host *);
int pluto_slave_configure(Scsi_Device *); int pluto_slave_configure(Scsi_Device *);
......
drivers/scsi/psi240i.c
浏览文件 @ d0be4a7d
...@@ -538,7 +538,7 @@ static void ReadChipMemory (void *pdata, USHORT base, USHORT length, USHORT port ...@@ -538,7 +538,7 @@ static void ReadChipMemory (void *pdata, USHORT base, USHORT length, USHORT port
* Returns: Number of adapters found. * Returns: Number of adapters found.
* *
****************************************************************/ ****************************************************************/
static int Psi240i_Detect (Scsi_Host_Template *tpnt) static int Psi240i_Detect (struct scsi_host_template *tpnt)
{ {
int board; int board;
int count = 0; int count = 0;
...@@ -669,7 +669,7 @@ static int Psi240i_BiosParam (struct scsi_device *sdev, struct block_device *dev ...@@ -669,7 +669,7 @@ static int Psi240i_BiosParam (struct scsi_device *sdev, struct block_device *dev
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "psi240i", .proc_name = "psi240i",
.name = "PSI-240I EIDE Disk Controller", .name = "PSI-240I EIDE Disk Controller",
.detect = Psi240i_Detect, .detect = Psi240i_Detect,
......
drivers/scsi/qla1280.c
浏览文件 @ d0be4a7d
...@@ -465,7 +465,7 @@ scsi_adjust_queue_depth(struct scsi_device *device, int tag, int depth) ...@@ -465,7 +465,7 @@ scsi_adjust_queue_depth(struct scsi_device *device, int tag, int depth)
} }
device->queue_depth = depth; device->queue_depth = depth;
} }
static inline struct Scsi_Host *scsi_host_alloc(Scsi_Host_Template *t, size_t s) static inline struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *t, size_t s)
{ {
return scsi_register(t, s); return scsi_register(t, s);
} }
...@@ -1175,7 +1175,7 @@ qla1280_biosparam(struct scsi_device *sdev, struct block_device *bdev, ...@@ -1175,7 +1175,7 @@ qla1280_biosparam(struct scsi_device *sdev, struct block_device *bdev,
#if LINUX_VERSION_CODE < 0x020600 #if LINUX_VERSION_CODE < 0x020600
static int static int
qla1280_detect(Scsi_Host_Template *template) qla1280_detect(struct scsi_host_template *template)
{ {
struct pci_device_id *id = &qla1280_pci_tbl[0]; struct pci_device_id *id = &qla1280_pci_tbl[0];
struct pci_dev *pdev = NULL; struct pci_dev *pdev = NULL;
...@@ -4505,7 +4505,7 @@ static struct scsi_host_template qla1280_driver_template = { ...@@ -4505,7 +4505,7 @@ static struct scsi_host_template qla1280_driver_template = {
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
}; };
#else #else
static Scsi_Host_Template qla1280_driver_template = { static struct scsi_host_template qla1280_driver_template = {
.proc_name = "qla1280", .proc_name = "qla1280",
.name = "Qlogic ISP 1280/12160", .name = "Qlogic ISP 1280/12160",
.detect = qla1280_detect, .detect = qla1280_detect,
......
drivers/scsi/qlogicfas.c
浏览文件 @ d0be4a7d
...@@ -47,7 +47,7 @@ static char qlogicfas_name[] = "qlogicfas"; ...@@ -47,7 +47,7 @@ static char qlogicfas_name[] = "qlogicfas";
* Look for qlogic card and init if found * Look for qlogic card and init if found
*/ */
static struct Scsi_Host *__qlogicfas_detect(Scsi_Host_Template *host, static struct Scsi_Host *__qlogicfas_detect(struct scsi_host_template *host,
int qbase, int qbase,
int qlirq) int qlirq)
{ {
...@@ -142,7 +142,7 @@ module_param_array(irq, int, NULL, 0); ...@@ -142,7 +142,7 @@ module_param_array(irq, int, NULL, 0);
MODULE_PARM_DESC(iobase, "I/O address"); MODULE_PARM_DESC(iobase, "I/O address");
MODULE_PARM_DESC(irq, "IRQ"); MODULE_PARM_DESC(irq, "IRQ");
static int __devinit qlogicfas_detect(Scsi_Host_Template *sht) static int __devinit qlogicfas_detect(struct scsi_host_template *sht)
{ {
struct Scsi_Host *shost; struct Scsi_Host *shost;
struct qlogicfas408_priv *priv; struct qlogicfas408_priv *priv;
...@@ -183,7 +183,7 @@ static int qlogicfas_release(struct Scsi_Host *shost) ...@@ -183,7 +183,7 @@ static int qlogicfas_release(struct Scsi_Host *shost)
/* /*
* The driver template is also needed for PCMCIA * The driver template is also needed for PCMCIA
*/ */
static Scsi_Host_Template qlogicfas_driver_template = { static struct scsi_host_template qlogicfas_driver_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = qlogicfas_name, .name = qlogicfas_name,
.proc_name = qlogicfas_name, .proc_name = qlogicfas_name,
......
drivers/scsi/qlogicfc.c
浏览文件 @ d0be4a7d
...@@ -711,7 +711,7 @@ static inline void isp2x00_disable_irqs(struct Scsi_Host *host) ...@@ -711,7 +711,7 @@ static inline void isp2x00_disable_irqs(struct Scsi_Host *host)
} }
static int isp2x00_detect(Scsi_Host_Template * tmpt) static int isp2x00_detect(struct scsi_host_template * tmpt)
{ {
int hosts = 0; int hosts = 0;
unsigned long wait_time; unsigned long wait_time;
...@@ -2210,7 +2210,7 @@ void isp2x00_print_scsi_cmd(Scsi_Cmnd * cmd) ...@@ -2210,7 +2210,7 @@ void isp2x00_print_scsi_cmd(Scsi_Cmnd * cmd)
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.detect = isp2x00_detect, .detect = isp2x00_detect,
.release = isp2x00_release, .release = isp2x00_release,
.info = isp2x00_info, .info = isp2x00_info,
......
drivers/scsi/sata_mv.c
浏览文件 @ d0be4a7d
...@@ -270,7 +270,7 @@ static irqreturn_t mv_interrupt(int irq, void *dev_instance, ...@@ -270,7 +270,7 @@ static irqreturn_t mv_interrupt(int irq, void *dev_instance,
static void mv_eng_timeout(struct ata_port *ap); static void mv_eng_timeout(struct ata_port *ap);
static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
static Scsi_Host_Template mv_sht = { static struct scsi_host_template mv_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/sata_nv.c
浏览文件 @ d0be4a7d
...@@ -219,7 +219,7 @@ static struct pci_driver nv_pci_driver = { ...@@ -219,7 +219,7 @@ static struct pci_driver nv_pci_driver = {
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
}; };
static Scsi_Host_Template nv_sht = { static struct scsi_host_template nv_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/sata_promise.c
浏览文件 @ d0be4a7d
...@@ -94,7 +94,7 @@ static void pdc_irq_clear(struct ata_port *ap); ...@@ -94,7 +94,7 @@ static void pdc_irq_clear(struct ata_port *ap);
static int pdc_qc_issue_prot(struct ata_queued_cmd *qc); static int pdc_qc_issue_prot(struct ata_queued_cmd *qc);
static Scsi_Host_Template pdc_ata_sht = { static struct scsi_host_template pdc_ata_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/sata_qstor.c
浏览文件 @ d0be4a7d
...@@ -128,7 +128,7 @@ static u8 qs_bmdma_status(struct ata_port *ap); ...@@ -128,7 +128,7 @@ static u8 qs_bmdma_status(struct ata_port *ap);
static void qs_irq_clear(struct ata_port *ap); static void qs_irq_clear(struct ata_port *ap);
static void qs_eng_timeout(struct ata_port *ap); static void qs_eng_timeout(struct ata_port *ap);
static Scsi_Host_Template qs_ata_sht = { static struct scsi_host_template qs_ata_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/sata_sil.c
浏览文件 @ d0be4a7d
...@@ -131,7 +131,7 @@ static struct pci_driver sil_pci_driver = { ...@@ -131,7 +131,7 @@ static struct pci_driver sil_pci_driver = {
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
}; };
static Scsi_Host_Template sil_sht = { static struct scsi_host_template sil_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/sata_sil24.c
浏览文件 @ d0be4a7d
...@@ -255,7 +255,7 @@ static struct pci_driver sil24_pci_driver = { ...@@ -255,7 +255,7 @@ static struct pci_driver sil24_pci_driver = {
.remove = ata_pci_remove_one, /* safe? */ .remove = ata_pci_remove_one, /* safe? */
}; };
static Scsi_Host_Template sil24_sht = { static struct scsi_host_template sil24_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/sata_sis.c
浏览文件 @ d0be4a7d
...@@ -83,7 +83,7 @@ static struct pci_driver sis_pci_driver = { ...@@ -83,7 +83,7 @@ static struct pci_driver sis_pci_driver = {
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
}; };
static Scsi_Host_Template sis_sht = { static struct scsi_host_template sis_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/sata_svw.c
浏览文件 @ d0be4a7d
...@@ -284,7 +284,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start, ...@@ -284,7 +284,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
#endif /* CONFIG_PPC_OF */ #endif /* CONFIG_PPC_OF */
static Scsi_Host_Template k2_sata_sht = { static struct scsi_host_template k2_sata_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/sata_sx4.c
浏览文件 @ d0be4a7d
...@@ -177,7 +177,7 @@ static void pdc20621_irq_clear(struct ata_port *ap); ...@@ -177,7 +177,7 @@ static void pdc20621_irq_clear(struct ata_port *ap);
static int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc); static int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc);
static Scsi_Host_Template pdc_sata_sht = { static struct scsi_host_template pdc_sata_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/sata_uli.c
浏览文件 @ d0be4a7d
...@@ -71,7 +71,7 @@ static struct pci_driver uli_pci_driver = { ...@@ -71,7 +71,7 @@ static struct pci_driver uli_pci_driver = {
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
}; };
static Scsi_Host_Template uli_sht = { static struct scsi_host_template uli_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/sata_via.c
浏览文件 @ d0be4a7d
...@@ -90,7 +90,7 @@ static struct pci_driver svia_pci_driver = { ...@@ -90,7 +90,7 @@ static struct pci_driver svia_pci_driver = {
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
}; };
static Scsi_Host_Template svia_sht = { static struct scsi_host_template svia_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/sata_vsc.c
浏览文件 @ d0be4a7d
...@@ -219,7 +219,7 @@ static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance, ...@@ -219,7 +219,7 @@ static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance,
} }
static Scsi_Host_Template vsc_sata_sht = { static struct scsi_host_template vsc_sata_sht = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = DRV_NAME, .name = DRV_NAME,
.ioctl = ata_scsi_ioctl, .ioctl = ata_scsi_ioctl,
......
drivers/scsi/scsi_debug.c
浏览文件 @ d0be4a7d
...@@ -182,7 +182,7 @@ struct sdebug_queued_cmd { ...@@ -182,7 +182,7 @@ struct sdebug_queued_cmd {
}; };
static struct sdebug_queued_cmd queued_arr[SCSI_DEBUG_CANQUEUE]; static struct sdebug_queued_cmd queued_arr[SCSI_DEBUG_CANQUEUE];
static Scsi_Host_Template sdebug_driver_template = { static struct scsi_host_template sdebug_driver_template = {
.proc_info = scsi_debug_proc_info, .proc_info = scsi_debug_proc_info,
.name = "SCSI DEBUG", .name = "SCSI DEBUG",
.info = scsi_debug_info, .info = scsi_debug_info,
......
drivers/scsi/scsi_typedefs.h
浏览文件 @ d0be4a7d
typedef struct scsi_host_template Scsi_Host_Template;
typedef struct scsi_device Scsi_Device; typedef struct scsi_device Scsi_Device;
typedef struct scsi_cmnd Scsi_Cmnd; typedef struct scsi_cmnd Scsi_Cmnd;
typedef struct scsi_request Scsi_Request; typedef struct scsi_request Scsi_Request;
......
drivers/scsi/seagate.c
浏览文件 @ d0be4a7d
...@@ -418,7 +418,7 @@ static inline void borken_wait (void) ...@@ -418,7 +418,7 @@ static inline void borken_wait (void)
#define ULOOP( i ) for (clock = i*8;;) #define ULOOP( i ) for (clock = i*8;;)
#define TIMEOUT (!(clock--)) #define TIMEOUT (!(clock--))
int __init seagate_st0x_detect (Scsi_Host_Template * tpnt) int __init seagate_st0x_detect (struct scsi_host_template * tpnt)
{ {
struct Scsi_Host *instance; struct Scsi_Host *instance;
int i, j; int i, j;
...@@ -1649,7 +1649,7 @@ static int seagate_st0x_release(struct Scsi_Host *shost) ...@@ -1649,7 +1649,7 @@ static int seagate_st0x_release(struct Scsi_Host *shost)
return 0; return 0;
} }
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.detect = seagate_st0x_detect, .detect = seagate_st0x_detect,
.release = seagate_st0x_release, .release = seagate_st0x_release,
.info = seagate_st0x_info, .info = seagate_st0x_info,
......
drivers/scsi/seagate.h
浏览文件 @ d0be4a7d
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef _SEAGATE_H #ifndef _SEAGATE_H
#define SEAGATE_H #define SEAGATE_H
static int seagate_st0x_detect(Scsi_Host_Template *); static int seagate_st0x_detect(struct scsi_host_template *);
static int seagate_st0x_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int seagate_st0x_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
static int seagate_st0x_abort(Scsi_Cmnd *); static int seagate_st0x_abort(Scsi_Cmnd *);
......
drivers/scsi/sgiwd93.c
浏览文件 @ d0be4a7d
...@@ -218,7 +218,7 @@ static inline void init_hpc_chain(struct hpc_data *hd) ...@@ -218,7 +218,7 @@ static inline void init_hpc_chain(struct hpc_data *hd)
} }
static struct Scsi_Host * __init sgiwd93_setup_scsi( static struct Scsi_Host * __init sgiwd93_setup_scsi(
Scsi_Host_Template *SGIblows, int unit, int irq, struct scsi_host_template *SGIblows, int unit, int irq,
struct hpc3_scsiregs *hregs, unsigned char *wdregs) struct hpc3_scsiregs *hregs, unsigned char *wdregs)
{ {
struct ip22_hostdata *hdata; struct ip22_hostdata *hdata;
...@@ -266,7 +266,7 @@ static struct Scsi_Host * __init sgiwd93_setup_scsi( ...@@ -266,7 +266,7 @@ static struct Scsi_Host * __init sgiwd93_setup_scsi(
return NULL; return NULL;
} }
int __init sgiwd93_detect(Scsi_Host_Template *SGIblows) int __init sgiwd93_detect(struct scsi_host_template *SGIblows)
{ {
int found = 0; int found = 0;
...@@ -325,7 +325,7 @@ static int sgiwd93_bus_reset(Scsi_Cmnd *cmd) ...@@ -325,7 +325,7 @@ static int sgiwd93_bus_reset(Scsi_Cmnd *cmd)
* arguments not with pointers. So this is going to blow up beautyfully * arguments not with pointers. So this is going to blow up beautyfully
* on 64-bit systems with memory outside the compat address spaces. * on 64-bit systems with memory outside the compat address spaces.
*/ */
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.proc_name = "SGIWD93", .proc_name = "SGIWD93",
.name = "SGI WD93", .name = "SGI WD93",
.detect = sgiwd93_detect, .detect = sgiwd93_detect,
......
drivers/scsi/sun3_NCR5380.c
浏览文件 @ d0be4a7d
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
*/ */
static struct Scsi_Host *first_instance = NULL; static struct Scsi_Host *first_instance = NULL;
static Scsi_Host_Template *the_template = NULL; static struct scsi_host_template *the_template = NULL;
/* Macros ease life... :-) */ /* Macros ease life... :-) */
#define SETUP_HOSTDATA(in) \ #define SETUP_HOSTDATA(in) \
......
drivers/scsi/sun3_scsi.c
浏览文件 @ d0be4a7d
...@@ -185,7 +185,7 @@ static inline void sun3_udc_write(unsigned short val, unsigned char reg) ...@@ -185,7 +185,7 @@ static inline void sun3_udc_write(unsigned short val, unsigned char reg)
static struct Scsi_Host *default_instance; static struct Scsi_Host *default_instance;
/* /*
* Function : int sun3scsi_detect(Scsi_Host_Template * tpnt) * Function : int sun3scsi_detect(struct scsi_host_template * tpnt)
* *
* Purpose : initializes mac NCR5380 driver based on the * Purpose : initializes mac NCR5380 driver based on the
* command line / compile time port and irq definitions. * command line / compile time port and irq definitions.
...@@ -196,7 +196,7 @@ static struct Scsi_Host *default_instance; ...@@ -196,7 +196,7 @@ static struct Scsi_Host *default_instance;
* *
*/ */
int sun3scsi_detect(Scsi_Host_Template * tpnt) int sun3scsi_detect(struct scsi_host_template * tpnt)
{ {
unsigned long ioaddr; unsigned long ioaddr;
static int called = 0; static int called = 0;
...@@ -621,7 +621,7 @@ static int sun3scsi_dma_finish(int write_flag) ...@@ -621,7 +621,7 @@ static int sun3scsi_dma_finish(int write_flag)
#include "sun3_NCR5380.c" #include "sun3_NCR5380.c"
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.name = SUN3_SCSI_NAME, .name = SUN3_SCSI_NAME,
.detect = sun3scsi_detect, .detect = sun3scsi_detect,
.release = sun3scsi_release, .release = sun3scsi_release,
......
drivers/scsi/sun3_scsi.h
浏览文件 @ d0be4a7d
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#define IOBASE_SUN3_VMESCSI 0xff200000 #define IOBASE_SUN3_VMESCSI 0xff200000
static int sun3scsi_abort (Scsi_Cmnd *); static int sun3scsi_abort (Scsi_Cmnd *);
static int sun3scsi_detect (Scsi_Host_Template *); static int sun3scsi_detect (struct scsi_host_template *);
static const char *sun3scsi_info (struct Scsi_Host *); static const char *sun3scsi_info (struct Scsi_Host *);
static int sun3scsi_bus_reset(Scsi_Cmnd *); static int sun3scsi_bus_reset(Scsi_Cmnd *);
static int sun3scsi_queue_command (Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int sun3scsi_queue_command (Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
......
drivers/scsi/sun3_scsi_vme.c
浏览文件 @ d0be4a7d
...@@ -127,7 +127,7 @@ static inline void sun3scsi_write(int reg, int value) ...@@ -127,7 +127,7 @@ static inline void sun3scsi_write(int reg, int value)
static struct Scsi_Host *default_instance; static struct Scsi_Host *default_instance;
/* /*
* Function : int sun3scsi_detect(Scsi_Host_Template * tpnt) * Function : int sun3scsi_detect(struct scsi_host_template * tpnt)
* *
* Purpose : initializes mac NCR5380 driver based on the * Purpose : initializes mac NCR5380 driver based on the
* command line / compile time port and irq definitions. * command line / compile time port and irq definitions.
...@@ -138,7 +138,7 @@ static struct Scsi_Host *default_instance; ...@@ -138,7 +138,7 @@ static struct Scsi_Host *default_instance;
* *
*/ */
static int sun3scsi_detect(Scsi_Host_Template * tpnt) static int sun3scsi_detect(struct scsi_host_template * tpnt)
{ {
unsigned long ioaddr, irq = 0; unsigned long ioaddr, irq = 0;
static int called = 0; static int called = 0;
...@@ -564,7 +564,7 @@ static int sun3scsi_dma_finish(int write_flag) ...@@ -564,7 +564,7 @@ static int sun3scsi_dma_finish(int write_flag)
#include "sun3_NCR5380.c" #include "sun3_NCR5380.c"
static Scsi_Host_Template driver_template = { static struct scsi_host_template driver_template = {
.name = SUN3_SCSI_NAME, .name = SUN3_SCSI_NAME,
.detect = sun3scsi_detect, .detect = sun3scsi_detect,
.release = sun3scsi_release, .release = sun3scsi_release,
......
drivers/scsi/sun3x_esp.c
浏览文件 @ d0be4a7d
此差异已折叠。
drivers/scsi/sym53c416.c
浏览文件 @ d0be4a7d
此差异已折叠。
drivers/scsi/sym53c416.h
浏览文件 @ d0be4a7d
此差异已折叠。
drivers/scsi/t128.c
浏览文件 @ d0be4a7d
此差异已折叠。
drivers/scsi/t128.h
浏览文件 @ d0be4a7d
此差异已折叠。
drivers/scsi/u14-34f.c
浏览文件 @ d0be4a7d
此差异已折叠。
drivers/scsi/ultrastor.c
浏览文件 @ d0be4a7d
此差异已折叠。
drivers/scsi/ultrastor.h
浏览文件 @ d0be4a7d
此差异已折叠。
drivers/usb/image/microtek.c
浏览文件 @ d0be4a7d
此差异已折叠。
include/linux/libata.h
浏览文件 @ d0be4a7d
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或