Commit e61aff8b authored by Art Haas's avatar Art Haas Committed by Linus Torvalds

[PATCH] C99 initializers for drivers/scsi (1 of 4)

parent 5af2409f
...@@ -474,23 +474,23 @@ void tw_unmask_command_interrupt(TW_Device_Extension *tw_dev); ...@@ -474,23 +474,23 @@ void tw_unmask_command_interrupt(TW_Device_Extension *tw_dev);
/* Scsi_Host_Template Initializer */ /* Scsi_Host_Template Initializer */
#define TWXXXX { \ #define TWXXXX { \
proc_name : "3w-xxxx", \ .proc_name = "3w-xxxx", \
proc_info : tw_scsi_proc_info, \ .proc_info = tw_scsi_proc_info, \
name : "3ware Storage Controller", \ .name = "3ware Storage Controller", \
detect : tw_scsi_detect, \ .detect = tw_scsi_detect, \
release : tw_scsi_release, \ .release = tw_scsi_release, \
queuecommand : tw_scsi_queue, \ .queuecommand = tw_scsi_queue, \
eh_abort_handler : tw_scsi_eh_abort, \ .eh_abort_handler = tw_scsi_eh_abort, \
eh_host_reset_handler : tw_scsi_eh_reset, \ .eh_host_reset_handler = tw_scsi_eh_reset, \
bios_param : tw_scsi_biosparam, \ .bios_param = tw_scsi_biosparam, \
can_queue : TW_Q_LENGTH-1, \ .can_queue = TW_Q_LENGTH-1, \
this_id: -1, \ .this_id = -1, \
sg_tablesize : TW_MAX_SGL_LENGTH, \ .sg_tablesize = TW_MAX_SGL_LENGTH, \
cmd_per_lun: TW_MAX_CMDS_PER_LUN, \ .cmd_per_lun = TW_MAX_CMDS_PER_LUN, \
present : 0, \ .present = 0, \
unchecked_isa_dma : 0, \ .unchecked_isa_dma = 0, \
use_clustering : ENABLE_CLUSTERING, \ .use_clustering = ENABLE_CLUSTERING, \
emulated : 1, \ .emulated = 1, \
highmem_io : 1 \ .highmem_io = 1 \
} }
#endif /* _3W_XXXX_H */ #endif /* _3W_XXXX_H */
...@@ -59,16 +59,16 @@ extern int NCR53c7xx_release(struct Scsi_Host *); ...@@ -59,16 +59,16 @@ extern int NCR53c7xx_release(struct Scsi_Host *);
#endif #endif
#define NCR53c7xx { \ #define NCR53c7xx { \
name: "NCR53c{7,8}xx (rel 17)", \ .name = "NCR53c{7,8}xx (rel 17)", \
detect: NCR53c7xx_detect, \ .detect = NCR53c7xx_detect, \
queuecommand: NCR53c7xx_queue_command, \ .queuecommand = NCR53c7xx_queue_command, \
abort: NCR53c7xx_abort, \ .abort = NCR53c7xx_abort, \
reset: NCR53c7xx_reset, \ .reset = NCR53c7xx_reset, \
can_queue: 24, \ .can_queue = 24, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: 127, \ .sg_tablesize = 127, \
cmd_per_lun: 3, \ .cmd_per_lun = 3, \
use_clustering: DISABLE_CLUSTERING} .use_clustering = DISABLE_CLUSTERING}
#ifndef HOSTS_C #ifndef HOSTS_C
......
...@@ -51,20 +51,20 @@ struct AM53C974_hostdata { ...@@ -51,20 +51,20 @@ struct AM53C974_hostdata {
}; };
#define AM53C974 { \ #define AM53C974 { \
proc_name: "am53c974", \ .proc_name = "am53c974", \
name: "AM53C974", \ .name = "AM53C974", \
detect: AM53C974_pci_detect, \ .detect = AM53C974_pci_detect, \
release: AM53C974_release, \ .release = AM53C974_release, \
info: AM53C974_info, \ .info = AM53C974_info, \
command: AM53C974_command, \ .command = AM53C974_command, \
queuecommand: AM53C974_queue_command, \ .queuecommand = AM53C974_queue_command, \
abort: AM53C974_abort, \ .abort = AM53C974_abort, \
reset: AM53C974_reset, \ .reset = AM53C974_reset, \
can_queue: 12, \ .can_queue = 12, \
this_id: -1, \ .this_id = -1, \
sg_tablesize: SG_ALL, \ .sg_tablesize = SG_ALL, \
cmd_per_lun: 1, \ .cmd_per_lun = 1, \
use_clustering: DISABLE_CLUSTERING \ .use_clustering = DISABLE_CLUSTERING \
} }
static int AM53C974_pci_detect(Scsi_Host_Template * tpnt); static int AM53C974_pci_detect(Scsi_Host_Template * tpnt);
......
...@@ -65,18 +65,18 @@ extern int BusLogic_SlaveConfigure(SCSI_Device_T *); ...@@ -65,18 +65,18 @@ extern int BusLogic_SlaveConfigure(SCSI_Device_T *);
*/ */
#define BUSLOGIC \ #define BUSLOGIC \
{ proc_name: "BusLogic", /* ProcFS Directory Entry */ \ { .proc_name = "BusLogic", /* ProcFS Directory Entry */ \
proc_info: BusLogic_ProcDirectoryInfo, /* ProcFS Info Function */ \ .proc_info = BusLogic_ProcDirectoryInfo, /* ProcFS Info Function */ \
name: "BusLogic", /* Driver Name */ \ .name = "BusLogic", /* Driver Name */ \
detect: BusLogic_DetectHostAdapter, /* Detect Host Adapter */ \ .detect = BusLogic_DetectHostAdapter, /* Detect Host Adapter */ \
release: BusLogic_ReleaseHostAdapter, /* Release Host Adapter */ \ .release = BusLogic_ReleaseHostAdapter, /* Release Host Adapter */ \
info: BusLogic_DriverInfo, /* Driver Info Function */ \ .info = BusLogic_DriverInfo, /* Driver Info Function */ \
queuecommand: BusLogic_QueueCommand, /* Queue Command Function */ \ .queuecommand = BusLogic_QueueCommand, /* Queue Command Function */ \
slave_configure:BusLogic_SlaveConfigure, /* Configure a SCSI_Device*/ \ .slave_configure = BusLogic_SlaveConfigure, /* Configure a SCSI_Device*/ \
bios_param: BusLogic_BIOSDiskParameters, /* BIOS Disk Parameters */ \ .bios_param = BusLogic_BIOSDiskParameters, /* BIOS Disk Parameters */ \
unchecked_isa_dma: 1, /* Default Initial Value */ \ .unchecked_isa_dma = 1, /* Default Initial Value */ \
max_sectors: 128, /* I/O queue len limit */ \ .max_sectors = 128, /* I/O queue len limit */ \
use_clustering: ENABLE_CLUSTERING } /* Enable Clustering */ .use_clustering = ENABLE_CLUSTERING } /* Enable Clustering */
/* /*
......
...@@ -30,18 +30,18 @@ int wd33c93_reset(Scsi_Cmnd *, unsigned int); ...@@ -30,18 +30,18 @@ int wd33c93_reset(Scsi_Cmnd *, unsigned int);
#define CAN_QUEUE 16 #define CAN_QUEUE 16
#endif #endif
#define A2091_SCSI { proc_name: "A2901", \ #define A2091_SCSI { .proc_name = "A2901", \
name: "Commodore A2091/A590 SCSI", \ .name = "Commodore A2091/A590 SCSI", \
detect: a2091_detect, \ .detect = a2091_detect, \
release: a2091_release, \ .release = a2091_release, \
queuecommand: wd33c93_queuecommand, \ .queuecommand = wd33c93_queuecommand, \
abort: wd33c93_abort, \ .abort = wd33c93_abort, \
reset: wd33c93_reset, \ .reset = wd33c93_reset, \
can_queue: CAN_QUEUE, \ .can_queue = CAN_QUEUE, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: SG_ALL, \ .sg_tablesize = SG_ALL, \
cmd_per_lun: CMD_PER_LUN, \ .cmd_per_lun = CMD_PER_LUN, \
use_clustering: DISABLE_CLUSTERING } .use_clustering = DISABLE_CLUSTERING }
/* /*
* if the transfer address ANDed with this results in a non-zero * if the transfer address ANDed with this results in a non-zero
......
...@@ -30,19 +30,19 @@ int wd33c93_reset(Scsi_Cmnd *, unsigned int); ...@@ -30,19 +30,19 @@ int wd33c93_reset(Scsi_Cmnd *, unsigned int);
#define CAN_QUEUE 16 #define CAN_QUEUE 16
#endif #endif
#define _A3000_SCSI { proc_name: "A3000", \ #define _A3000_SCSI { .proc_name = "A3000", \
proc_info: NULL, \ .proc_info = NULL, \
name: "Amiga 3000 built-in SCSI", \ .name = "Amiga 3000 built-in SCSI", \
detect: a3000_detect, \ .detect = a3000_detect, \
release: a3000_release, \ .release = a3000_release, \
queuecommand: wd33c93_queuecommand, \ .queuecommand = wd33c93_queuecommand, \
abort: wd33c93_abort, \ .abort = wd33c93_abort, \
reset: wd33c93_reset, \ .reset = wd33c93_reset, \
can_queue: CAN_QUEUE, \ .can_queue = CAN_QUEUE, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: SG_ALL, \ .sg_tablesize = SG_ALL, \
cmd_per_lun: CMD_PER_LUN, \ .cmd_per_lun = CMD_PER_LUN, \
use_clustering: ENABLE_CLUSTERING } .use_clustering = ENABLE_CLUSTERING }
/* /*
* if the transfer address ANDed with this results in a non-zero * if the transfer address ANDed with this results in a non-zero
......
...@@ -72,22 +72,22 @@ void advansys_setup(char *, int *); ...@@ -72,22 +72,22 @@ void advansys_setup(char *, int *);
*/ */
#if ASC_LINUX_KERNEL24 #if ASC_LINUX_KERNEL24
#define ADVANSYS { \ #define ADVANSYS { \
proc_name: "advansys", \ .proc_name = "advansys", \
proc_info: advansys_proc_info, \ .proc_info = advansys_proc_info, \
name: "advansys", \ .name = "advansys", \
detect: advansys_detect, \ .detect = advansys_detect, \
release: advansys_release, \ .release = advansys_release, \
info: advansys_info, \ .info = advansys_info, \
queuecommand: advansys_queuecommand, \ .queuecommand = advansys_queuecommand, \
eh_bus_reset_handler: advansys_reset, \ .eh_bus_reset_handler = advansys_reset, \
bios_param: advansys_biosparam, \ .bios_param = advansys_biosparam, \
slave_configure: advansys_slave_configure, \ .slave_configure = advansys_slave_configure, \
/* \ /* \
* Because the driver may control an ISA adapter 'unchecked_isa_dma' \ * Because the driver may control an ISA adapter 'unchecked_isa_dma' \
* must be set. The flag will be cleared in advansys_detect for non-ISA \ * must be set. The flag will be cleared in advansys_detect for non-ISA \
* adapters. Refer to the comment in scsi_module.c for more information. \ * adapters. Refer to the comment in scsi_module.c for more information. \
*/ \ */ \
unchecked_isa_dma: 1, \ .unchecked_isa_dma = 1, \
/* \ /* \
* All adapters controlled by this driver are capable of large \ * All adapters controlled by this driver are capable of large \
* scatter-gather lists. According to the mid-level SCSI documentation \ * scatter-gather lists. According to the mid-level SCSI documentation \
...@@ -95,25 +95,25 @@ void advansys_setup(char *, int *); ...@@ -95,25 +95,25 @@ void advansys_setup(char *, int *);
* 'use_clustering'. But empirically while CPU utilization is increased \ * 'use_clustering'. But empirically while CPU utilization is increased \
* by enabling clustering, I/O throughput increases as well. \ * by enabling clustering, I/O throughput increases as well. \
*/ \ */ \
use_clustering: ENABLE_CLUSTERING, \ .use_clustering = ENABLE_CLUSTERING, \
} }
#elif ASC_LINUX_KERNEL22 #elif ASC_LINUX_KERNEL22
#define ADVANSYS { \ #define ADVANSYS { \
proc_info: advansys_proc_info, \ .proc_info = advansys_proc_info, \
name: "advansys", \ .name = "advansys", \
detect: advansys_detect, \ .detect = advansys_detect, \
release: advansys_release, \ .release = advansys_release, \
info: advansys_info, \ .info = advansys_info, \
queuecommand: advansys_queuecommand, \ .queuecommand = advansys_queuecommand, \
use_new_eh_code: 1, \ .use_new_eh_code = 1, \
eh_bus_reset_handler: advansys_reset, \ .eh_bus_reset_handler = advansys_reset, \
bios_param: advansys_biosparam, \ .bios_param = advansys_biosparam, \
/* \ /* \
* Because the driver may control an ISA adapter 'unchecked_isa_dma' \ * Because the driver may control an ISA adapter 'unchecked_isa_dma' \
* must be set. The flag will be cleared in advansys_detect for non-ISA \ * must be set. The flag will be cleared in advansys_detect for non-ISA \
* adapters. Refer to the comment in scsi_module.c for more information. \ * adapters. Refer to the comment in scsi_module.c for more information. \
*/ \ */ \
unchecked_isa_dma: 1, \ .unchecked_isa_dma = 1, \
/* \ /* \
* All adapters controlled by this driver are capable of large \ * All adapters controlled by this driver are capable of large \
* scatter-gather lists. According to the mid-level SCSI documentation \ * scatter-gather lists. According to the mid-level SCSI documentation \
...@@ -121,7 +121,7 @@ void advansys_setup(char *, int *); ...@@ -121,7 +121,7 @@ void advansys_setup(char *, int *);
* 'use_clustering'. But empirically while CPU utilization is increased \ * 'use_clustering'. But empirically while CPU utilization is increased \
* by enabling clustering, I/O throughput increases as well. \ * by enabling clustering, I/O throughput increases as well. \
*/ \ */ \
use_clustering: ENABLE_CLUSTERING, \ .use_clustering = ENABLE_CLUSTERING, \
} }
#endif #endif
#endif /* _ADVANSYS_H */ #endif /* _ADVANSYS_H */
...@@ -31,25 +31,25 @@ int aha152x_proc_info(char *buffer, char **start, off_t offset, int length, int ...@@ -31,25 +31,25 @@ int aha152x_proc_info(char *buffer, char **start, off_t offset, int length, int
#define AHA152X_REVID "Adaptec 152x SCSI driver; $Revision: 2.5 $" #define AHA152X_REVID "Adaptec 152x SCSI driver; $Revision: 2.5 $"
/* Initial value of Scsi_Host entry */ /* Initial value of Scsi_Host entry */
#define AHA152X { proc_name: "aha152x", \ #define AHA152X { .proc_name = "aha152x", \
proc_info: aha152x_proc_info, \ .proc_info = aha152x_proc_info, \
name: AHA152X_REVID, \ .name = AHA152X_REVID, \
detect: aha152x_detect, \ .detect = aha152x_detect, \
command: aha152x_command, \ .command = aha152x_command, \
queuecommand: aha152x_queue, \ .queuecommand = aha152x_queue, \
eh_abort_handler: aha152x_abort, \ .eh_abort_handler = aha152x_abort, \
eh_device_reset_handler: aha152x_device_reset, \ .eh_device_reset_handler = aha152x_device_reset, \
eh_bus_reset_handler: aha152x_bus_reset, \ .eh_bus_reset_handler = aha152x_bus_reset, \
eh_host_reset_handler: aha152x_host_reset, \ .eh_host_reset_handler = aha152x_host_reset, \
release: aha152x_release, \ .release = aha152x_release, \
bios_param: aha152x_biosparam, \ .bios_param = aha152x_biosparam, \
can_queue: 1, \ .can_queue = 1, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: SG_ALL, \ .sg_tablesize = SG_ALL, \
cmd_per_lun: 1, \ .cmd_per_lun = 1, \
present: 0, \ .present = 0, \
unchecked_isa_dma: 0, \ .unchecked_isa_dma = 0, \
use_clustering: DISABLE_CLUSTERING } .use_clustering = DISABLE_CLUSTERING }
#endif #endif
......
...@@ -151,21 +151,21 @@ static int aha1542_biosparam(struct scsi_device *, struct block_device *, ...@@ -151,21 +151,21 @@ static int aha1542_biosparam(struct scsi_device *, struct block_device *,
#define NULL 0 #define NULL 0
#endif #endif
#define AHA1542 { proc_name: "aha1542", \ #define AHA1542 { .proc_name = "aha1542", \
name: "Adaptec 1542", \ .name = "Adaptec 1542", \
detect: aha1542_detect, \ .detect = aha1542_detect, \
command: aha1542_command, \ .command = aha1542_command, \
queuecommand: aha1542_queuecommand, \ .queuecommand = aha1542_queuecommand, \
eh_abort_handler: aha1542_abort, \ .eh_abort_handler = aha1542_abort, \
eh_device_reset_handler: aha1542_dev_reset, \ .eh_device_reset_handler = aha1542_dev_reset, \
eh_bus_reset_handler: aha1542_bus_reset, \ .eh_bus_reset_handler = aha1542_bus_reset, \
eh_host_reset_handler: aha1542_host_reset, \ .eh_host_reset_handler = aha1542_host_reset, \
bios_param: aha1542_biosparam, \ .bios_param = aha1542_biosparam, \
can_queue: AHA1542_MAILBOXES, \ .can_queue = AHA1542_MAILBOXES, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: AHA1542_SCATTER, \ .sg_tablesize = AHA1542_SCATTER, \
cmd_per_lun: AHA1542_CMDLUN, \ .cmd_per_lun = AHA1542_CMDLUN, \
unchecked_isa_dma: 1, \ .unchecked_isa_dma = 1, \
use_clustering: ENABLE_CLUSTERING \ .use_clustering = ENABLE_CLUSTERING \
} }
#endif #endif
...@@ -162,17 +162,17 @@ static int aha1740_proc_info(char *buffer, char **start, off_t offset, int lengt ...@@ -162,17 +162,17 @@ static int aha1740_proc_info(char *buffer, char **start, off_t offset, int lengt
#define AHA1740_SCATTER 16 #define AHA1740_SCATTER 16
#define AHA1740_CMDLUN 1 #define AHA1740_CMDLUN 1
#define AHA1740 { proc_name: "aha1740", \ #define AHA1740 { .proc_name = "aha1740", \
proc_info: aha1740_proc_info, \ .proc_info = aha1740_proc_info, \
name: "Adaptec 174x (EISA)", \ .name = "Adaptec 174x (EISA)", \
detect: aha1740_detect, \ .detect = aha1740_detect, \
command: aha1740_command, \ .command = aha1740_command, \
queuecommand: aha1740_queuecommand, \ .queuecommand = aha1740_queuecommand, \
bios_param: aha1740_biosparam, \ .bios_param = aha1740_biosparam, \
can_queue: AHA1740_ECBS, \ .can_queue = AHA1740_ECBS, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: AHA1740_SCATTER, \ .sg_tablesize = AHA1740_SCATTER, \
cmd_per_lun: AHA1740_CMDLUN, \ .cmd_per_lun = AHA1740_CMDLUN, \
use_clustering: ENABLE_CLUSTERING} .use_clustering = ENABLE_CLUSTERING}
#endif #endif
...@@ -24,15 +24,15 @@ void NCR53c7x0_intr(int irq, void *dev_id, struct pt_regs * regs); ...@@ -24,15 +24,15 @@ void NCR53c7x0_intr(int irq, void *dev_id, struct pt_regs * regs);
#include <scsi/scsicam.h> #include <scsi/scsicam.h>
#define AMIGA7XX_SCSI {name: "Amiga NCR53c710 SCSI", \ #define AMIGA7XX_SCSI {.name = "Amiga NCR53c710 SCSI", \
detect: amiga7xx_detect, \ .detect = amiga7xx_detect, \
queuecommand: NCR53c7xx_queue_command, \ .queuecommand = NCR53c7xx_queue_command, \
abort: NCR53c7xx_abort, \ .abort = NCR53c7xx_abort, \
reset: NCR53c7xx_reset, \ .reset = NCR53c7xx_reset, \
can_queue: 24, \ .can_queue = 24, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: 63, \ .sg_tablesize = 63, \
cmd_per_lun: 3, \ .cmd_per_lun = 3, \
use_clustering: DISABLE_CLUSTERING } .use_clustering = DISABLE_CLUSTERING }
#endif /* AMIGA7XX_H */ #endif /* AMIGA7XX_H */
...@@ -51,19 +51,19 @@ int atari_scsi_release (struct Scsi_Host *); ...@@ -51,19 +51,19 @@ int atari_scsi_release (struct Scsi_Host *);
#define DEFAULT_USE_TAGGED_QUEUING 0 #define DEFAULT_USE_TAGGED_QUEUING 0
#define ATARI_SCSI { proc_info: atari_scsi_proc_info, \ #define ATARI_SCSI { .proc_info = atari_scsi_proc_info, \
name: "Atari native SCSI", \ .name = "Atari native SCSI", \
detect: atari_scsi_detect, \ .detect = atari_scsi_detect, \
release: atari_scsi_release, \ .release = atari_scsi_release, \
info: atari_scsi_info, \ .info = atari_scsi_info, \
queuecommand: atari_scsi_queue_command, \ .queuecommand = atari_scsi_queue_command, \
abort: atari_scsi_abort, \ .abort = atari_scsi_abort, \
reset: atari_scsi_reset, \ .reset = atari_scsi_reset, \
can_queue: 0, /* initialized at run-time */ \ .can_queue = 0, /* initialized at run-time */ \
this_id: 0, /* initialized at run-time */ \ .this_id = 0, /* initialized at run-time */ \
sg_tablesize: 0, /* initialized at run-time */ \ .sg_tablesize = 0, /* initialized at run-time */ \
cmd_per_lun: 0, /* initialized at run-time */ \ .cmd_per_lun = 0, /* initialized at run-time */ \
use_clustering: DISABLE_CLUSTERING } .use_clustering = DISABLE_CLUSTERING }
#define NCR5380_implementation_fields /* none */ #define NCR5380_implementation_fields /* none */
......
...@@ -38,21 +38,21 @@ extern const char *atp870u_info(struct Scsi_Host *); ...@@ -38,21 +38,21 @@ extern const char *atp870u_info(struct Scsi_Host *);
extern int atp870u_proc_info(char *, char **, off_t, int, int, int); extern int atp870u_proc_info(char *, char **, off_t, int, int, int);
#define ATP870U { \ #define ATP870U { \
proc_info: atp870u_proc_info, \ .proc_info = atp870u_proc_info, \
detect: atp870u_detect, \ .detect = atp870u_detect, \
release: atp870u_release, \ .release = atp870u_release, \
info: atp870u_info, \ .info = atp870u_info, \
command: atp870u_command, \ .command = atp870u_command, \
queuecommand: atp870u_queuecommand, \ .queuecommand = atp870u_queuecommand, \
eh_abort_handler: atp870u_abort, \ .eh_abort_handler = atp870u_abort, \
bios_param: atp870u_biosparam, \ .bios_param = atp870u_biosparam, \
can_queue: qcnt, /* max simultaneous cmds */\ .can_queue = qcnt, /* max simultaneous cmds */\
this_id: 7, /* scsi id of host adapter */\ .this_id = 7, /* scsi id of host adapter */\
sg_tablesize: ATP870U_SCATTER, /* max scatter-gather cmds */\ .sg_tablesize = ATP870U_SCATTER, /* max scatter-gather cmds */\
cmd_per_lun: ATP870U_CMDLUN, /* cmds per lun (linked cmds) */\ .cmd_per_lun = ATP870U_CMDLUN, /* cmds per lun (linked cmds) */\
present: 0, /* number of 7xxx's present */\ .present = 0, /* number of 7xxx's present */\
unchecked_isa_dma: 0, /* no memory DMA restrictions */\ .unchecked_isa_dma = 0, /* no memory DMA restrictions */\
use_clustering: ENABLE_CLUSTERING, \ .use_clustering = ENABLE_CLUSTERING, \
} }
#endif #endif
...@@ -57,19 +57,19 @@ extern int esp_reset(Scsi_Cmnd *, unsigned int); ...@@ -57,19 +57,19 @@ extern int esp_reset(Scsi_Cmnd *, unsigned int);
extern int esp_proc_info(char *buffer, char **start, off_t offset, int length, extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout); int hostno, int inout);
#define SCSI_BLZ1230 { proc_name: "esp-blz1230", \ #define SCSI_BLZ1230 { .proc_name = "esp-blz1230", \
proc_info: esp_proc_info, \ .proc_info = esp_proc_info, \
name: "Blizzard1230 SCSI IV", \ .name = "Blizzard1230 SCSI IV", \
detect: blz1230_esp_detect, \ .detect = blz1230_esp_detect, \
release: blz1230_esp_release, \ .release = blz1230_esp_release, \
command: esp_command, \ .command = esp_command, \
queuecommand: esp_queue, \ .queuecommand = esp_queue, \
abort: esp_abort, \ .abort = esp_abort, \
reset: esp_reset, \ .reset = esp_reset, \
can_queue: 7, \ .can_queue = 7, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: SG_ALL, \ .sg_tablesize = SG_ALL, \
cmd_per_lun: 1, \ .cmd_per_lun = 1, \
use_clustering: ENABLE_CLUSTERING } .use_clustering = ENABLE_CLUSTERING }
#endif /* BLZ1230_H */ #endif /* BLZ1230_H */
...@@ -53,18 +53,18 @@ extern int esp_reset(Scsi_Cmnd *, unsigned int); ...@@ -53,18 +53,18 @@ extern int esp_reset(Scsi_Cmnd *, unsigned int);
extern int esp_proc_info(char *buffer, char **start, off_t offset, int length, extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout); int hostno, int inout);
#define SCSI_BLZ2060 { proc_name: "esp-blz2060", \ #define SCSI_BLZ2060 { .proc_name = "esp-blz2060", \
proc_info: esp_proc_info, \ .proc_info = esp_proc_info, \
name: "Blizzard2060 SCSI", \ .name = "Blizzard2060 SCSI", \
detect: blz2060_esp_detect, \ .detect = blz2060_esp_detect, \
release: blz2060_esp_release, \ .release = blz2060_esp_release, \
queuecommand: esp_queue, \ .queuecommand = esp_queue, \
abort: esp_abort, \ .abort = esp_abort, \
reset: esp_reset, \ .reset = esp_reset, \
can_queue: 7, \ .can_queue = 7, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: SG_ALL, \ .sg_tablesize = SG_ALL, \
cmd_per_lun: 1, \ .cmd_per_lun = 1, \
use_clustering: ENABLE_CLUSTERING } .use_clustering = ENABLE_CLUSTERING }
#endif /* BLZ2060_H */ #endif /* BLZ2060_H */
...@@ -25,15 +25,15 @@ void NCR53c7x0_intr(int irq, void *dev_id, struct pt_regs * regs); ...@@ -25,15 +25,15 @@ void NCR53c7x0_intr(int irq, void *dev_id, struct pt_regs * regs);
#include <scsi/scsicam.h> #include <scsi/scsicam.h>
#define BVME6000_SCSI {name: "BVME6000 NCR53c710 SCSI", \ #define BVME6000_SCSI {.name = "BVME6000 NCR53c710 SCSI", \
detect: bvme6000_scsi_detect, \ .detect = bvme6000_scsi_detect, \
queuecommand: NCR53c7xx_queue_command, \ .queuecommand = NCR53c7xx_queue_command, \
abort: NCR53c7xx_abort, \ .abort = NCR53c7xx_abort, \
reset: NCR53c7xx_reset, \ .reset = NCR53c7xx_reset, \
can_queue: 24, \ .can_queue = 24, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: 63, \ .sg_tablesize = 63, \
cmd_per_lun: 3, \ .cmd_per_lun = 3, \
use_clustering: DISABLE_CLUSTERING } .use_clustering = DISABLE_CLUSTERING }
#endif /* BVME6000_SCSI_H */ #endif /* BVME6000_SCSI_H */
...@@ -21,22 +21,22 @@ extern int cpqfcTS_ioctl( Scsi_Device *ScsiDev, int Cmnd, void *arg); ...@@ -21,22 +21,22 @@ extern int cpqfcTS_ioctl( Scsi_Device *ScsiDev, int Cmnd, void *arg);
// limited only by available physical memory) we use SG_ALL. // limited only by available physical memory) we use SG_ALL.
#define CPQFCTS { \ #define CPQFCTS { \
detect: cpqfcTS_detect, \ .detect = cpqfcTS_detect, \
release: cpqfcTS_release, \ .release = cpqfcTS_release, \
info: cpqfcTS_info, \ .info = cpqfcTS_info, \
proc_info: cpqfcTS_proc_info, \ .proc_info = cpqfcTS_proc_info, \
ioctl: cpqfcTS_ioctl, \ .ioctl = cpqfcTS_ioctl, \
queuecommand: cpqfcTS_queuecommand, \ .queuecommand = cpqfcTS_queuecommand, \
eh_device_reset_handler: cpqfcTS_eh_device_reset, \ .eh_device_reset_handler = cpqfcTS_eh_device_reset, \
eh_abort_handler: cpqfcTS_eh_abort, \ .eh_abort_handler = cpqfcTS_eh_abort, \
bios_param: cpqfcTS_biosparam, \ .bios_param = cpqfcTS_biosparam, \
can_queue: CPQFCTS_REQ_QUEUE_LEN, \ .can_queue = CPQFCTS_REQ_QUEUE_LEN, \
this_id: -1, \ .this_id = -1, \
sg_tablesize: SG_ALL, \ .sg_tablesize = SG_ALL, \
cmd_per_lun: CPQFCTS_CMD_PER_LUN, \ .cmd_per_lun = CPQFCTS_CMD_PER_LUN, \
present: 0, \ .present = 0, \
unchecked_isa_dma: 0, \ .unchecked_isa_dma = 0, \
use_clustering: ENABLE_CLUSTERING, \ .use_clustering = ENABLE_CLUSTERING, \
} }
#endif /* CPQFCTS_H */ #endif /* CPQFCTS_H */
...@@ -56,18 +56,18 @@ extern int esp_proc_info(char *buffer, char **start, off_t offset, int length, ...@@ -56,18 +56,18 @@ extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout); int hostno, int inout);
#define SCSI_CYBERSTORM { proc_name: "esp-cyberstorm", \ #define SCSI_CYBERSTORM { .proc_name = "esp-cyberstorm", \
proc_info: esp_proc_info, \ .proc_info = esp_proc_info, \
name: "CyberStorm SCSI", \ .name = "CyberStorm SCSI", \
detect: cyber_esp_detect, \ .detect = cyber_esp_detect, \
release: cyber_esp_release, \ .release = cyber_esp_release, \
queuecommand: esp_queue, \ .queuecommand = esp_queue, \
abort: esp_abort, \ .abort = esp_abort, \
reset: esp_reset, \ .reset = esp_reset, \
can_queue: 7, \ .can_queue = 7, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: SG_ALL, \ .sg_tablesize = SG_ALL, \
cmd_per_lun: 1, \ .cmd_per_lun = 1, \
use_clustering: ENABLE_CLUSTERING } .use_clustering = ENABLE_CLUSTERING }
#endif /* CYBER_ESP_H */ #endif /* CYBER_ESP_H */
...@@ -43,18 +43,18 @@ extern int esp_reset(Scsi_Cmnd *, unsigned int); ...@@ -43,18 +43,18 @@ extern int esp_reset(Scsi_Cmnd *, unsigned int);
extern int esp_proc_info(char *buffer, char **start, off_t offset, int length, extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout); int hostno, int inout);
#define SCSI_CYBERSTORMII { proc_name: "esp-cyberstormII", \ #define SCSI_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", \
detect: cyberII_esp_detect, \ .detect = cyberII_esp_detect, \
release: cyberII_esp_release, \ .release = cyberII_esp_release, \
queuecommand: esp_queue, \ .queuecommand = esp_queue, \
abort: esp_abort, \ .abort = esp_abort, \
reset: esp_reset, \ .reset = esp_reset, \
can_queue: 7, \ .can_queue = 7, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: SG_ALL, \ .sg_tablesize = SG_ALL, \
cmd_per_lun: 1, \ .cmd_per_lun = 1, \
use_clustering: ENABLE_CLUSTERING } .use_clustering = ENABLE_CLUSTERING }
#endif /* CYBERII_ESP_H */ #endif /* CYBERII_ESP_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment