Skip to content

L
linux
Commit a864b859 authored by Art Haas's avatar Art Haas Committed by Linus Torvalds
Browse files
Options

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

parent e61aff8b
Hide whitespace changes
Inline Side-by-side
Showing with 405 additions and 405 deletions
drivers/scsi/dc390.h
View file @ a864b859
...@@ -52,41 +52,41 @@ extern int DC390_proc_info(char *buffer, char **start, off_t offset, int length, ...@@ -52,41 +52,41 @@ extern int DC390_proc_info(char *buffer, char **start, off_t offset, int length,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,30) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,30)
#define DC390_T { \ #define DC390_T { \
proc_name: "tmscsim", \ .proc_name = "tmscsim", \
proc_info: DC390_proc_info, \ .proc_info = DC390_proc_info, \
name: DC390_BANNER " V" DC390_VERSION, \ .name = DC390_BANNER " V" DC390_VERSION, \
detect: DC390_detect, \ .detect = DC390_detect, \
release: DC390_release, \ .release = DC390_release, \
queuecommand: DC390_queue_command, \ .queuecommand = DC390_queue_command, \
abort: DC390_abort, \ .abort = DC390_abort, \
reset: DC390_reset, \ .reset = DC390_reset, \
bios_param: DC390_bios_param, \ .bios_param = DC390_bios_param, \
can_queue: 42, \ .can_queue = 42, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: SG_ALL, \ .sg_tablesize = SG_ALL, \
cmd_per_lun: 16, \ .cmd_per_lun = 16, \
unchecked_isa_dma: 0, \ .unchecked_isa_dma = 0, \
use_clustering: DISABLE_CLUSTERING \ .use_clustering = DISABLE_CLUSTERING \
} }
#else #else
extern struct proc_dir_entry DC390_proc_scsi_tmscsim; extern struct proc_dir_entry DC390_proc_scsi_tmscsim;
#define DC390_T { \ #define DC390_T { \
proc_dir: &DC390_proc_scsi_tmscsim, \ .proc_dir = &DC390_proc_scsi_tmscsim, \
proc_info: DC390_proc_info, \ .proc_info = DC390_proc_info, \
name: DC390_BANNER " V" DC390_VERSION, \ .name = DC390_BANNER " V" DC390_VERSION, \
detect: DC390_detect, \ .detect = DC390_detect, \
release: DC390_release, \ .release = DC390_release, \
queuecommand: DC390_queue_command, \ .queuecommand = DC390_queue_command, \
abort: DC390_abort, \ .abort = DC390_abort, \
reset: DC390_reset, \ .reset = DC390_reset, \
bios_param: DC390_bios_param, \ .bios_param = DC390_bios_param, \
can_queue: 42, \ .can_queue = 42, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: SG_ALL, \ .sg_tablesize = SG_ALL, \
cmd_per_lun: 16, \ .cmd_per_lun = 16, \
NEW_EH \ NEW_EH \
unchecked_isa_dma: 0, \ .unchecked_isa_dma = 0, \
use_clustering: DISABLE_CLUSTERING \ .use_clustering = DISABLE_CLUSTERING \
} }
#endif #endif
#endif /* defined(HOSTS_C) || defined(MODULE) */ #endif /* defined(HOSTS_C) || defined(MODULE) */
......
drivers/scsi/dec_esp.h
View file @ a864b859
...@@ -27,19 +27,19 @@ extern int esp_proc_info(char *buffer, char **start, off_t offset, int length, ...@@ -27,19 +27,19 @@ extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout); int hostno, int inout);
#define SCSI_DEC_ESP { \ #define SCSI_DEC_ESP { \
proc_name: "esp", \ .proc_name = "esp", \
proc_info: &esp_proc_info, \ .proc_info = &esp_proc_info, \
name: "NCR53C94", \ .name = "NCR53C94", \
detect: dec_esp_detect, \ .detect = dec_esp_detect, \
info: esp_info, \ .info = esp_info, \
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: DISABLE_CLUSTERING, } .use_clustering = DISABLE_CLUSTERING, }
#endif /* DEC_ESP_H */ #endif /* DEC_ESP_H */
drivers/scsi/dmx3191d.h
View file @ a864b859
...@@ -32,22 +32,22 @@ static int dmx3191d_device_reset(Scsi_Cmnd *); ...@@ -32,22 +32,22 @@ static int dmx3191d_device_reset(Scsi_Cmnd *);
#define DMX3191D { \ #define DMX3191D { \
proc_info: dmx3191d_proc_info, \ .proc_info = dmx3191d_proc_info, \
name: "Domex DMX3191D", \ .name = "Domex DMX3191D", \
detect: dmx3191d_detect, \ .detect = dmx3191d_detect, \
release: dmx3191d_release_resources, \ .release = dmx3191d_release_resources, \
info: dmx3191d_info, \ .info = dmx3191d_info, \
queuecommand: dmx3191d_queue_command, \ .queuecommand = dmx3191d_queue_command, \
eh_abort_handler: dmx3191d_abort, \ .eh_abort_handler = dmx3191d_abort, \
eh_bus_reset_handler: dmx3191d_bus_reset, \ .eh_bus_reset_handler = dmx3191d_bus_reset, \
eh_device_reset_handler:dmx3191d_device_reset, \ .eh_device_reset_handler = dmx3191d_device_reset, \
eh_host_reset_handler: dmx3191d_host_reset, \ .eh_host_reset_handler = dmx3191d_host_reset, \
bios_param: NULL, \ .bios_param = NULL, \
can_queue: 32, \ .can_queue = 32, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: SG_ALL, \ .sg_tablesize = SG_ALL, \
cmd_per_lun: 2, \ .cmd_per_lun = 2, \
use_clustering: DISABLE_CLUSTERING \ .use_clustering = DISABLE_CLUSTERING \
} }
......
drivers/scsi/dpti.h
View file @ a864b859
...@@ -62,44 +62,44 @@ static int adpt_device_reset(Scsi_Cmnd* cmd); ...@@ -62,44 +62,44 @@ static int adpt_device_reset(Scsi_Cmnd* cmd);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,00) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,00)
#define DPT_I2O { \ #define DPT_I2O { \
proc_info: adpt_proc_info, \ .proc_info = adpt_proc_info, \
detect: adpt_detect, \ .detect = adpt_detect, \
release: adpt_release, \ .release = adpt_release, \
info: adpt_info, \ .info = adpt_info, \
queuecommand: adpt_queue, \ .queuecommand = adpt_queue, \
eh_abort_handler: adpt_abort, \ .eh_abort_handler = adpt_abort, \
eh_device_reset_handler: adpt_device_reset, \ .eh_device_reset_handler = adpt_device_reset, \
eh_bus_reset_handler: adpt_bus_reset, \ .eh_bus_reset_handler = adpt_bus_reset, \
eh_host_reset_handler: adpt_reset, \ .eh_host_reset_handler = adpt_reset, \
bios_param: adpt_bios_param, \ .bios_param = adpt_bios_param, \
can_queue: MAX_TO_IOP_MESSAGES ,/* max simultaneous cmds */\ .can_queue = MAX_TO_IOP_MESSAGES ,/* max simultaneous cmds */\
this_id: 7, /* scsi id of host adapter */\ .this_id = 7, /* scsi id of host adapter */\
sg_tablesize: 0, /* max scatter-gather cmds */\ .sg_tablesize = 0, /* max scatter-gather cmds */\
cmd_per_lun: 256, /* cmds per lun (linked cmds) */\ .cmd_per_lun = 256, /* cmds per lun (linked cmds) */\
use_clustering: ENABLE_CLUSTERING, \ .use_clustering = ENABLE_CLUSTERING, \
use_new_eh_code: 1 \ .use_new_eh_code = 1 \
} }
#else /* KERNEL_VERSION > 2.2.16 */ #else /* KERNEL_VERSION > 2.2.16 */
#define DPT_I2O { \ #define DPT_I2O { \
proc_info: adpt_proc_info, \ .proc_info = adpt_proc_info, \
detect: adpt_detect, \ .detect = adpt_detect, \
release: adpt_release, \ .release = adpt_release, \
info: adpt_info, \ .info = adpt_info, \
queuecommand: adpt_queue, \ .queuecommand = adpt_queue, \
eh_abort_handler: adpt_abort, \ .eh_abort_handler = adpt_abort, \
eh_device_reset_handler: adpt_device_reset, \ .eh_device_reset_handler = adpt_device_reset, \
eh_bus_reset_handler: adpt_bus_reset, \ .eh_bus_reset_handler = adpt_bus_reset, \
eh_host_reset_handler: adpt_reset, \ .eh_host_reset_handler = adpt_reset, \
bios_param: adpt_bios_param, \ .bios_param = adpt_bios_param, \
slave_configure: adpt_slave_configure, \ .slave_configure = adpt_slave_configure, \
can_queue: MAX_TO_IOP_MESSAGES, /* max simultaneous cmds */\ .can_queue = MAX_TO_IOP_MESSAGES, /* max simultaneous cmds */\
this_id: 7, /* scsi id of host adapter */\ .this_id = 7, /* scsi id of host adapter */\
sg_tablesize: 0, /* max scatter-gather cmds */\ .sg_tablesize = 0, /* max scatter-gather cmds */\
cmd_per_lun: 1, /* cmds per lun (linked cmds) */\ .cmd_per_lun = 1, /* cmds per lun (linked cmds) */\
use_clustering: ENABLE_CLUSTERING, \ .use_clustering = ENABLE_CLUSTERING, \
proc_name: "dpt_i2o" /* this is the name of our proc node*/ \ .proc_name = "dpt_i2o" /* this is the name of our proc node*/ \
} }
#endif #endif
......
drivers/scsi/dtc.h
View file @ a864b859
...@@ -54,19 +54,19 @@ static int dtc_proc_info (char *buffer, char **start, off_t offset, ...@@ -54,19 +54,19 @@ static int dtc_proc_info (char *buffer, char **start, off_t offset,
*/ */
#define DTC3x80 { \ #define DTC3x80 { \
name: "DTC 3180/3280 ", \ .name = "DTC 3180/3280 ", \
detect: dtc_detect, \ .detect = dtc_detect, \
queuecommand: dtc_queue_command, \ .queuecommand = dtc_queue_command, \
eh_abort_handler: dtc_abort, \ .eh_abort_handler = dtc_abort, \
eh_bus_reset_handler: dtc_bus_reset, \ .eh_bus_reset_handler = dtc_bus_reset, \
eh_device_reset_handler: dtc_device_reset, \ .eh_device_reset_handler = dtc_device_reset, \
eh_host_reset_handler: dtc_host_reset, \ .eh_host_reset_handler = dtc_host_reset, \
bios_param: dtc_biosparam, \ .bios_param = dtc_biosparam, \
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}
#define NCR5380_implementation_fields \ #define NCR5380_implementation_fields \
unsigned int base unsigned int base
......
drivers/scsi/eata.h
View file @ a864b859
...@@ -14,17 +14,17 @@ static int eata2x_slave_configure(Scsi_Device *); ...@@ -14,17 +14,17 @@ static int eata2x_slave_configure(Scsi_Device *);
#define EATA_VERSION "8.00.00" #define EATA_VERSION "8.00.00"
#define EATA { \ #define EATA { \
name: "EATA/DMA 2.0x rev. " EATA_VERSION " ", \ .name = "EATA/DMA 2.0x rev. " EATA_VERSION " ", \
detect: eata2x_detect, \ .detect = eata2x_detect, \
release: eata2x_release, \ .release = eata2x_release, \
queuecommand: eata2x_queuecommand, \ .queuecommand = eata2x_queuecommand, \
eh_abort_handler: eata2x_eh_abort, \ .eh_abort_handler = eata2x_eh_abort, \
eh_device_reset_handler: NULL, \ .eh_device_reset_handler = NULL, \
eh_bus_reset_handler: NULL, \ .eh_bus_reset_handler = NULL, \
eh_host_reset_handler: eata2x_eh_host_reset, \ .eh_host_reset_handler = eata2x_eh_host_reset, \
bios_param: eata2x_bios_param, \ .bios_param = eata2x_bios_param, \
slave_configure: eata2x_slave_configure, \ .slave_configure = eata2x_slave_configure, \
this_id: 7, \ .this_id = 7, \
unchecked_isa_dma: 1, \ .unchecked_isa_dma = 1, \
use_clustering: ENABLE_CLUSTERING \ .use_clustering = ENABLE_CLUSTERING \
} }
drivers/scsi/eata_dma.h
View file @ a864b859
...@@ -81,15 +81,15 @@ int eata_release(struct Scsi_Host *); ...@@ -81,15 +81,15 @@ int eata_release(struct Scsi_Host *);
#include <scsi/scsicam.h> #include <scsi/scsicam.h>
#define EATA_DMA { \ #define EATA_DMA { \
proc_info: eata_proc_info, /* procinfo */ \ .proc_info = eata_proc_info, /* procinfo */ \
name: "EATA (Extended Attachment) HBA driver", \ .name = "EATA (Extended Attachment) HBA driver", \
detect: eata_detect, \ .detect = eata_detect, \
release: eata_release, \ .release = eata_release, \
queuecommand: eata_queue, \ .queuecommand = eata_queue, \
abort: eata_abort, \ .abort = eata_abort, \
reset: eata_reset, \ .reset = eata_reset, \
unchecked_isa_dma: 1, /* True if ISA */ \ .unchecked_isa_dma = 1, /* True if ISA */ \
use_clustering: ENABLE_CLUSTERING } .use_clustering = ENABLE_CLUSTERING }
#endif /* _EATA_DMA_H */ #endif /* _EATA_DMA_H */
......
drivers/scsi/eata_pio.h
View file @ a864b859
...@@ -65,14 +65,14 @@ static int eata_pio_proc_info(char *, char **, off_t, int, int, int); ...@@ -65,14 +65,14 @@ static int eata_pio_proc_info(char *, char **, off_t, int, int, int);
static int eata_pio_release(struct Scsi_Host *); static int eata_pio_release(struct Scsi_Host *);
#define EATA_PIO { \ #define EATA_PIO { \
proc_info: eata_pio_proc_info, /* procinfo */ \ .proc_info = eata_pio_proc_info, /* procinfo */ \
name: "EATA (Extended Attachment) PIO driver",\ .name = "EATA (Extended Attachment) PIO driver",\
detect: eata_pio_detect, \ .detect = eata_pio_detect, \
release: eata_pio_release, \ .release = eata_pio_release, \
queuecommand: eata_pio_queue, \ .queuecommand = eata_pio_queue, \
eh_abort_handler: eata_pio_abort, \ .eh_abort_handler = eata_pio_abort, \
eh_host_reset_handler: eata_pio_host_reset, \ .eh_host_reset_handler = eata_pio_host_reset, \
use_clustering: ENABLE_CLUSTERING \ .use_clustering = ENABLE_CLUSTERING \
} }
#endif /* _EATA_PIO_H */ #endif /* _EATA_PIO_H */
drivers/scsi/fastlane.h
View file @ a864b859
...@@ -48,18 +48,18 @@ extern int esp_reset(Scsi_Cmnd *, unsigned int); ...@@ -48,18 +48,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_FASTLANE { proc_name: "esp-fastlane", \ #define SCSI_FASTLANE { .proc_name = "esp-fastlane", \
proc_info: esp_proc_info, \ .proc_info = esp_proc_info, \
name: "Fastlane SCSI", \ .name = "Fastlane SCSI", \
detect: fastlane_esp_detect, \ .detect = fastlane_esp_detect, \
release: fastlane_esp_release, \ .release = fastlane_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 /* FASTLANE_H */ #endif /* FASTLANE_H */
drivers/scsi/fcal.h
View file @ a864b859
...@@ -26,21 +26,21 @@ int fcal_proc_info (char *, char **, off_t, int, int, int); ...@@ -26,21 +26,21 @@ int fcal_proc_info (char *, char **, off_t, int, int, int);
int fcal_slave_configure(Scsi_Device *); int fcal_slave_configure(Scsi_Device *);
#define FCAL { \ #define FCAL { \
name: "Fibre Channel Arbitrated Loop",\ .name = "Fibre Channel Arbitrated Loop",\
detect: fcal_detect, \ .detect = fcal_detect, \
release: fcal_release, \ .release = fcal_release, \
proc_info: fcal_proc_info, \ .proc_info = fcal_proc_info, \
queuecommand: fcp_scsi_queuecommand, \ .queuecommand = fcp_scsi_queuecommand, \
slave_configure: fcal_slave_configure, \ .slave_configure = fcal_slave_configure, \
can_queue: FCAL_CAN_QUEUE, \ .can_queue = FCAL_CAN_QUEUE, \
this_id: -1, \ .this_id = -1, \
sg_tablesize: 1, \ .sg_tablesize = 1, \
cmd_per_lun: 1, \ .cmd_per_lun = 1, \
use_clustering: ENABLE_CLUSTERING, \ .use_clustering = ENABLE_CLUSTERING, \
eh_abort_handler: fcp_scsi_abort, \ .eh_abort_handler = fcp_scsi_abort, \
eh_device_reset_handler:fcp_scsi_dev_reset, \ .eh_device_reset_handler = fcp_scsi_dev_reset, \
eh_bus_reset_handler: fcp_scsi_bus_reset, \ .eh_bus_reset_handler = fcp_scsi_bus_reset, \
eh_host_reset_handler: fcp_scsi_host_reset, \ .eh_host_reset_handler = fcp_scsi_host_reset, \
} }
#endif /* !(_FCAL_H) */ #endif /* !(_FCAL_H) */
drivers/scsi/fd_mcs.h
View file @ a864b859
...@@ -36,23 +36,23 @@ static int fd_mcs_proc_info(char *, char **, off_t, int, int, int); ...@@ -36,23 +36,23 @@ static int fd_mcs_proc_info(char *, char **, off_t, int, int, int);
static const char *fd_mcs_info(struct Scsi_Host *); static const char *fd_mcs_info(struct Scsi_Host *);
#define FD_MCS {\ #define FD_MCS {\
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, \
release: fd_mcs_release, \ .release = fd_mcs_release, \
info: fd_mcs_info, \ .info = fd_mcs_info, \
command: fd_mcs_command, \ .command = fd_mcs_command, \
queuecommand: fd_mcs_queue, \ .queuecommand = fd_mcs_queue, \
eh_abort_handler: fd_mcs_abort, \ .eh_abort_handler = fd_mcs_abort, \
eh_bus_reset_handler: fd_mcs_bus_reset, \ .eh_bus_reset_handler = fd_mcs_bus_reset, \
eh_host_reset_handler: fd_mcs_host_reset, \ .eh_host_reset_handler = fd_mcs_host_reset, \
eh_device_reset_handler: fd_mcs_device_reset, \ .eh_device_reset_handler = fd_mcs_device_reset, \
bios_param: fd_mcs_biosparam, \ .bios_param = fd_mcs_biosparam, \
can_queue: 1, \ .can_queue = 1, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: 64, \ .sg_tablesize = 64, \
cmd_per_lun: 1, \ .cmd_per_lun = 1, \
use_clustering: DISABLE_CLUSTERING \ .use_clustering = DISABLE_CLUSTERING \
} }
#endif /* _FD_MCS_H */ #endif /* _FD_MCS_H */
drivers/scsi/fdomain.h
View file @ a864b859
...@@ -39,21 +39,21 @@ static int fdomain_16x0_proc_info(char *buffer, char **start, off_t offse ...@@ -39,21 +39,21 @@ static int fdomain_16x0_proc_info(char *buffer, char **start, off_t offse
int length, int hostno, int inout ); int length, int hostno, int inout );
static int fdomain_16x0_release(struct Scsi_Host *shpnt); static int fdomain_16x0_release(struct Scsi_Host *shpnt);
#define FDOMAIN_16X0 { proc_info: fdomain_16x0_proc_info, \ #define FDOMAIN_16X0 { .proc_info = fdomain_16x0_proc_info, \
detect: fdomain_16x0_detect, \ .detect = fdomain_16x0_detect, \
info: fdomain_16x0_info, \ .info = fdomain_16x0_info, \
command: fdomain_16x0_command, \ .command = fdomain_16x0_command, \
queuecommand: fdomain_16x0_queue, \ .queuecommand = fdomain_16x0_queue, \
eh_abort_handler: fdomain_16x0_abort, \ .eh_abort_handler = fdomain_16x0_abort, \
eh_bus_reset_handler: fdomain_16x0_bus_reset, \ .eh_bus_reset_handler = fdomain_16x0_bus_reset, \
eh_device_reset_handler: fdomain_16x0_device_reset, \ .eh_device_reset_handler = fdomain_16x0_device_reset, \
eh_host_reset_handler: fdomain_16x0_host_reset, \ .eh_host_reset_handler = fdomain_16x0_host_reset, \
bios_param: fdomain_16x0_biosparam, \ .bios_param = fdomain_16x0_biosparam, \
release: fdomain_16x0_release, \ .release = fdomain_16x0_release, \
can_queue: 1, \ .can_queue = 1, \
this_id: 6, \ .this_id = 6, \
sg_tablesize: 64, \ .sg_tablesize = 64, \
cmd_per_lun: 1, \ .cmd_per_lun = 1, \
use_clustering: DISABLE_CLUSTERING \ .use_clustering = DISABLE_CLUSTERING \
} }
#endif #endif
drivers/scsi/g_NCR5380.h
View file @ a864b859
...@@ -66,22 +66,22 @@ static int generic_NCR5380_proc_info(char* buffer, char** start, off_t offset, i ...@@ -66,22 +66,22 @@ static int generic_NCR5380_proc_info(char* buffer, char** start, off_t offset, i
#endif #endif
#define GENERIC_NCR5380 { \ #define GENERIC_NCR5380 { \
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, \
release: generic_NCR5380_release_resources, \ .release = generic_NCR5380_release_resources, \
info: (void *)generic_NCR5380_info, \ .info = (void *)generic_NCR5380_info, \
queuecommand: generic_NCR5380_queue_command, \ .queuecommand = generic_NCR5380_queue_command, \
eh_abort_handler:generic_NCR5380_abort, \ .eh_abort_handler = generic_NCR5380_abort, \
eh_bus_reset_handler:generic_NCR5380_bus_reset, \ .eh_bus_reset_handler = generic_NCR5380_bus_reset, \
eh_device_reset_handler:generic_NCR5380_device_reset, \ .eh_device_reset_handler = generic_NCR5380_device_reset, \
eh_host_reset_handler:generic_NCR5380_host_reset, \ .eh_host_reset_handler = generic_NCR5380_host_reset, \
bios_param: NCR5380_BIOSPARAM, \ .bios_param = NCR5380_BIOSPARAM, \
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}
#ifndef HOSTS_C #ifndef HOSTS_C
......
drivers/scsi/gdth.h
View file @ a864b859
...@@ -1037,28 +1037,28 @@ int gdth_eh_abort(Scsi_Cmnd *scp); ...@@ -1037,28 +1037,28 @@ int gdth_eh_abort(Scsi_Cmnd *scp);
int gdth_eh_device_reset(Scsi_Cmnd *scp); int gdth_eh_device_reset(Scsi_Cmnd *scp);
int gdth_eh_bus_reset(Scsi_Cmnd *scp); int gdth_eh_bus_reset(Scsi_Cmnd *scp);
int gdth_eh_host_reset(Scsi_Cmnd *scp); int gdth_eh_host_reset(Scsi_Cmnd *scp);
#define GDTH { proc_name: "gdth", \ #define 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",\
detect: gdth_detect, \ .detect = gdth_detect, \
release: gdth_release, \ .release = gdth_release, \
info: gdth_info, \ .info = gdth_info, \
command: NULL, \ .command = NULL, \
queuecommand: gdth_queuecommand, \ .queuecommand = gdth_queuecommand, \
eh_abort_handler: gdth_eh_abort, \ .eh_abort_handler = gdth_eh_abort, \
eh_device_reset_handler: gdth_eh_device_reset, \ .eh_device_reset_handler = gdth_eh_device_reset, \
eh_bus_reset_handler: gdth_eh_bus_reset, \ .eh_bus_reset_handler = gdth_eh_bus_reset, \
eh_host_reset_handler: gdth_eh_host_reset, \ .eh_host_reset_handler = gdth_eh_host_reset, \
abort: gdth_abort, \ .abort = gdth_abort, \
reset: gdth_reset, \ .reset = gdth_reset, \
bios_param: gdth_bios_param, \ .bios_param = gdth_bios_param, \
can_queue: GDTH_MAXCMDS, \ .can_queue = GDTH_MAXCMDS, \
this_id: -1, \ .this_id = -1, \
sg_tablesize: GDTH_MAXSG, \ .sg_tablesize = GDTH_MAXSG, \
cmd_per_lun: GDTH_MAXC_P_L, \ .cmd_per_lun = GDTH_MAXC_P_L, \
present: 0, \ .present = 0, \
unchecked_isa_dma: 1, \ .unchecked_isa_dma = 1, \
use_clustering: ENABLE_CLUSTERING } .use_clustering = ENABLE_CLUSTERING }
#endif #endif
drivers/scsi/gvp11.h
View file @ a864b859
...@@ -32,18 +32,18 @@ int wd33c93_reset(Scsi_Cmnd *, unsigned int); ...@@ -32,18 +32,18 @@ int wd33c93_reset(Scsi_Cmnd *, unsigned int);
#ifdef HOSTS_C #ifdef HOSTS_C
#define GVP11_SCSI { proc_name: "GVP11", \ #define GVP11_SCSI { .proc_name = "GVP11", \
name: "GVP Series II SCSI", \ .name = "GVP Series II SCSI", \
detect: gvp11_detect, \ .detect = gvp11_detect, \
release: gvp11_release, \ .release = gvp11_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 }
#else #else
/* /*
......
drivers/scsi/ibmmca.h
View file @ a864b859
...@@ -27,22 +27,22 @@ static int ibmmca_biosparam (struct scsi_device *, struct block_device *, sector ...@@ -27,22 +27,22 @@ static int ibmmca_biosparam (struct scsi_device *, struct block_device *, sector
* about this, but it will break things in the future. * about this, but it will break things in the future.
*/ */
#define IBMMCA { \ #define IBMMCA { \
proc_name: "ibmmca", /*proc_name*/ \ .proc_name = "ibmmca", /*proc_name*/ \
proc_info: ibmmca_proc_info, /*proc info fn*/ \ .proc_info = ibmmca_proc_info, /*proc info fn*/ \
name: "IBM SCSI-Subsystem", /*name*/ \ .name = "IBM SCSI-Subsystem", /*name*/ \
detect: ibmmca_detect, /*detect fn*/ \ .detect = ibmmca_detect, /*detect fn*/ \
release: ibmmca_release, /*release fn*/ \ .release = ibmmca_release, /*release fn*/ \
command: ibmmca_command, /*command fn*/ \ .command = ibmmca_command, /*command fn*/ \
queuecommand: ibmmca_queuecommand, /*queuecommand fn*/ \ .queuecommand = ibmmca_queuecommand, /*queuecommand fn*/ \
eh_abort_handler:ibmmca_abort, /*abort fn*/ \ .eh_abort_handler = ibmmca_abort, /*abort fn*/ \
eh_host_reset_handler:ibmmca_host_reset, /*reset fn*/ \ .eh_host_reset_handler = ibmmca_host_reset, /*reset fn*/ \
bios_param: ibmmca_biosparam, /*bios fn*/ \ .bios_param = ibmmca_biosparam, /*bios fn*/ \
can_queue: 16, /*can_queue*/ \ .can_queue = 16, /*can_queue*/ \
this_id: 7, /*set by detect*/ \ .this_id = 7, /*set by detect*/ \
sg_tablesize: 16, /*sg_tablesize*/ \ .sg_tablesize = 16, /*sg_tablesize*/ \
cmd_per_lun: 1, /*cmd_per_lun*/ \ .cmd_per_lun = 1, /*cmd_per_lun*/ \
unchecked_isa_dma: 0, /*32-Bit Busmaster */ \ .unchecked_isa_dma = 0, /*32-Bit Busmaster */ \
use_clustering: ENABLE_CLUSTERING /*use_clustering*/ \ .use_clustering = ENABLE_CLUSTERING /*use_clustering*/ \
} }
#endif /* _IBMMCA_H */ #endif /* _IBMMCA_H */
drivers/scsi/imm.h
View file @ a864b859
...@@ -163,21 +163,21 @@ int imm_proc_info(char *, char **, off_t, int, int, int); ...@@ -163,21 +163,21 @@ int imm_proc_info(char *, char **, off_t, int, int, int);
int imm_biosparam(struct scsi_device *, struct block_device *, int imm_biosparam(struct scsi_device *, struct block_device *,
sector_t, int *); sector_t, int *);
#define IMM { proc_name: "imm", \ #define IMM { .proc_name = "imm", \
proc_info: imm_proc_info, \ .proc_info = imm_proc_info, \
name: "Iomega VPI2 (imm) interface",\ .name = "Iomega VPI2 (imm) interface",\
detect: imm_detect, \ .detect = imm_detect, \
release: imm_release, \ .release = imm_release, \
command: imm_command, \ .command = imm_command, \
queuecommand: imm_queuecommand, \ .queuecommand = imm_queuecommand, \
eh_abort_handler: imm_abort, \ .eh_abort_handler = imm_abort, \
eh_device_reset_handler: NULL, \ .eh_device_reset_handler = NULL, \
eh_bus_reset_handler: imm_reset, \ .eh_bus_reset_handler = imm_reset, \
eh_host_reset_handler: imm_reset, \ .eh_host_reset_handler = imm_reset, \
bios_param: imm_biosparam, \ .bios_param = imm_biosparam, \
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 /* _IMM_H */ #endif /* _IMM_H */
drivers/scsi/in2000.h
View file @ a864b859
...@@ -414,22 +414,22 @@ static int in2000_device_reset(Scsi_Cmnd *); ...@@ -414,22 +414,22 @@ static int in2000_device_reset(Scsi_Cmnd *);
#define IN2000_CPL 2 #define IN2000_CPL 2
#define IN2000_HOST_ID 7 #define IN2000_HOST_ID 7
#define IN2000 { proc_name: "in2000", /* name of /proc/scsi directory entry */ \ #define IN2000 { .proc_name = "in2000", /* name of /proc/scsi directory entry */ \
proc_info: in2000_proc_info, /* pointer to proc info function */ \ .proc_info = in2000_proc_info, /* pointer to proc info function */ \
name: "Always IN2000", /* device name */ \ .name = "Always IN2000", /* device name */ \
detect: in2000_detect, /* returns number of in2000's found */ \ .detect = in2000_detect, /* returns number of in2000's found */ \
release: in2000_release, /* release the in2000 controller */ \ .release = in2000_release, /* release the in2000 controller */ \
queuecommand: in2000_queuecommand, /* queue scsi command, don't wait */ \ .queuecommand = in2000_queuecommand, /* queue scsi command, don't wait */ \
eh_abort_handler: in2000_abort, /* abort current command */ \ .eh_abort_handler = in2000_abort, /* abort current command */ \
eh_bus_reset_handler: in2000_bus_reset, /* reset scsi bus */ \ .eh_bus_reset_handler = in2000_bus_reset, /* reset scsi bus */ \
eh_device_reset_handler: in2000_device_reset, /* reset scsi device */ \ .eh_device_reset_handler = in2000_device_reset, /* reset scsi device */ \
eh_host_reset_handler: in2000_host_reset, /* reset scsi hba */ \ .eh_host_reset_handler = in2000_host_reset, /* reset scsi hba */ \
bios_param: in2000_biosparam, /* figures out BIOS parameters for lilo, etc */ \ .bios_param = in2000_biosparam, /* figures out BIOS parameters for lilo, etc */ \
can_queue: IN2000_CAN_Q, /* max commands we can queue up */ \ .can_queue = IN2000_CAN_Q, /* max commands we can queue up */ \
this_id: IN2000_HOST_ID, /* host-adapter scsi id */ \ .this_id = IN2000_HOST_ID, /* host-adapter scsi id */ \
sg_tablesize: IN2000_SG, /* scatter-gather table size */ \ .sg_tablesize = IN2000_SG, /* scatter-gather table size */ \
cmd_per_lun: IN2000_CPL, /* commands per lun */ \ .cmd_per_lun = IN2000_CPL, /* commands per lun */ \
use_clustering: DISABLE_CLUSTERING, /* ENABLE_CLUSTERING may speed things up */ \ .use_clustering = DISABLE_CLUSTERING, /* ENABLE_CLUSTERING may speed things up */ \
} }
#endif /* IN2000_H */ #endif /* IN2000_H */
drivers/scsi/ini9100u.h
View file @ a864b859
...@@ -88,31 +88,31 @@ extern int i91u_biosparam(struct scsi_device *, struct block_device *, ...@@ -88,31 +88,31 @@ extern int i91u_biosparam(struct scsi_device *, struct block_device *,
#define i91u_REVID "Initio INI-9X00U/UW SCSI device driver; Revision: 1.03g" #define i91u_REVID "Initio INI-9X00U/UW SCSI device driver; Revision: 1.03g"
#define INI9100U { \ #define INI9100U { \
next: NULL, \ .next = NULL, \
module: NULL, \ .module = NULL, \
proc_name: "INI9100U", \ .proc_name = "INI9100U", \
proc_info: NULL, \ .proc_info = NULL, \
name: i91u_REVID, \ .name = i91u_REVID, \
detect: i91u_detect, \ .detect = i91u_detect, \
release: i91u_release, \ .release = i91u_release, \
info: NULL, \ .info = NULL, \
command: i91u_command, \ .command = i91u_command, \
queuecommand: i91u_queue, \ .queuecommand = i91u_queue, \
eh_strategy_handler: NULL, \ .eh_strategy_handler = NULL, \
eh_abort_handler: NULL, \ .eh_abort_handler = NULL, \
eh_device_reset_handler: NULL, \ .eh_device_reset_handler = NULL, \
eh_bus_reset_handler: NULL, \ .eh_bus_reset_handler = NULL, \
eh_host_reset_handler: NULL, \ .eh_host_reset_handler = NULL, \
abort: i91u_abort, \ .abort = i91u_abort, \
reset: i91u_reset, \ .reset = i91u_reset, \
bios_param: i91u_biosparam, \ .bios_param = i91u_biosparam, \
can_queue: 1, \ .can_queue = 1, \
this_id: 1, \ .this_id = 1, \
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: ENABLE_CLUSTERING, \ .use_clustering = ENABLE_CLUSTERING, \
} }
#define VIRT_TO_BUS(i) (unsigned int) virt_to_bus((void *)(i)) #define VIRT_TO_BUS(i) (unsigned int) virt_to_bus((void *)(i))
......
drivers/scsi/inia100.h
View file @ a864b859
...@@ -85,21 +85,21 @@ static int inia100_bus_reset(Scsi_Cmnd *); ...@@ -85,21 +85,21 @@ static int inia100_bus_reset(Scsi_Cmnd *);
#define inia100_REVID "Initio INI-A100U2W SCSI device driver; Revision: 1.02d" #define inia100_REVID "Initio INI-A100U2W SCSI device driver; Revision: 1.02d"
#define INIA100 { \ #define INIA100 { \
proc_name: "inia100", \ .proc_name = "inia100", \
name: inia100_REVID, \ .name = inia100_REVID, \
detect: inia100_detect, \ .detect = inia100_detect, \
release: inia100_release, \ .release = inia100_release, \
queuecommand: inia100_queue, \ .queuecommand = inia100_queue, \
eh_abort_handler:inia100_abort, \ .eh_abort_handler = inia100_abort, \
eh_bus_reset_handler: inia100_bus_reset, \ .eh_bus_reset_handler = inia100_bus_reset, \
eh_device_reset_handler:inia100_device_reset, \ .eh_device_reset_handler = inia100_device_reset, \
can_queue: 1, \ .can_queue = 1, \
this_id: 1, \ .this_id = 1, \
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: ENABLE_CLUSTERING, \ .use_clustering = ENABLE_CLUSTERING, \
} }
#define ULONG unsigned long #define ULONG unsigned long
......
drivers/scsi/ips.h
View file @ a864b859
...@@ -407,80 +407,80 @@ ...@@ -407,80 +407,80 @@
* Scsi_Host Template * Scsi_Host Template
*/ */
#if LINUX_VERSION_CODE < LinuxVersionCode(2,4,0) #if LINUX_VERSION_CODE < LinuxVersionCode(2,4,0)
#define IPS { \ #define IPS { \
module : NULL, \ .module = NULL, \
proc_info : NULL, \ .proc_info = NULL, \
proc_dir : NULL, \ .proc_dir = NULL, \
name : NULL, \ .name = NULL, \
detect : ips_detect, \ .detect = ips_detect, \
release : ips_release, \ .release = ips_release, \
info : ips_info, \ .info = ips_info, \
command : NULL, \ .command = NULL, \
queuecommand : ips_queue, \ .queuecommand = ips_queue, \
eh_strategy_handler : NULL, \ .eh_strategy_handler = NULL, \
eh_abort_handler : ips_eh_abort, \ .eh_abort_handler = ips_eh_abort, \
eh_device_reset_handler : NULL, \ .eh_device_reset_handler = NULL, \
eh_bus_reset_handler : NULL, \ .eh_bus_reset_handler = NULL, \
eh_host_reset_handler : ips_eh_reset, \ .eh_host_reset_handler = ips_eh_reset, \
abort : NULL, \ .abort = NULL, \
reset : NULL, \ .reset = NULL, \
slave_attach : NULL, \ .slave_attach = NULL, \
bios_param : ips_biosparam, \ .bios_param = ips_biosparam,\
can_queue : 0, \ .can_queue = 0, \
this_id: -1, \ .this_id = -1, \
sg_tablesize : IPS_MAX_SG, \ .sg_tablesize = IPS_MAX_SG, \
cmd_per_lun: 3, \ .cmd_per_lun = 3, \
present : 0, \ .present = 0, \
unchecked_isa_dma : 0, \ .unchecked_isa_dma = 0, \
use_clustering : ENABLE_CLUSTERING, \ .use_clustering = ENABLE_CLUSTERING, \
use_new_eh_code : 1 \ .use_new_eh_code = 1 \
} }
#elif LINUX_VERSION_CODE < LinuxVersionCode(2,5,0) #elif LINUX_VERSION_CODE < LinuxVersionCode(2,5,0)
#define IPS { \ #define IPS{ \
module : NULL, \ .module = NULL, \
proc_info : NULL, \ .proc_info = NULL, \
name : NULL, \ .name = NULL, \
detect : ips_detect, \ .detect = ips_detect, \
release : ips_release, \ .release = ips_release, \
info : ips_info, \ .info = ips_info, \
command : NULL, \ .command = NULL, \
queuecommand : ips_queue, \ .queuecommand = ips_queue, \
eh_strategy_handler : NULL, \ .eh_strategy_handler = NULL, \
eh_abort_handler : ips_eh_abort, \ .eh_abort_handler = ips_eh_abort, \
eh_device_reset_handler : NULL, \ .eh_device_reset_handler = NULL, \
eh_bus_reset_handler : NULL, \ .eh_bus_reset_handler = NULL, \
eh_host_reset_handler : ips_eh_reset, \ .eh_host_reset_handler = ips_eh_reset, \
abort : NULL, \ .abort = NULL, \
reset : NULL, \ .reset = NULL, \
slave_attach : NULL, \ .slave_attach = NULL, \
bios_param : ips_biosparam, \ .bios_param = ips_biosparam,\
can_queue : 0, \ .can_queue = 0, \
this_id: -1, \ .this_id = -1, \
sg_tablesize : IPS_MAX_SG, \ .sg_tablesize = IPS_MAX_SG, \
cmd_per_lun: 3, \ .cmd_per_lun = 3, \
present : 0, \ .present = 0, \
unchecked_isa_dma : 0, \ .unchecked_isa_dma = 0, \
use_clustering : ENABLE_CLUSTERING, \ .use_clustering = ENABLE_CLUSTERING,\
use_new_eh_code : 1 \ .use_new_eh_code = 1 \
} }
#else #else
#define IPS { \ #define IPS { \
detect : ips_detect, \ .detect = ips_detect, \
release : ips_release, \ .release = ips_release, \
info : ips_info, \ .info = ips_info, \
queuecommand : ips_queue, \ .queuecommand = ips_queue, \
eh_abort_handler : ips_eh_abort, \ .eh_abort_handler = ips_eh_abort, \
eh_host_reset_handler : ips_eh_reset, \ .eh_host_reset_handler = ips_eh_reset, \
slave_configure : ips_slave_configure,\ .slave_configure = ips_slave_configure, \
bios_param : ips_biosparam, \ .bios_param = ips_biosparam, \
can_queue : 0, \ .can_queue = 0, \
this_id: -1, \ .this_id = -1, \
sg_tablesize : IPS_MAX_SG, \ .sg_tablesize = IPS_MAX_SG, \
cmd_per_lun: 3, \ .cmd_per_lun = 3, \
present : 0, \ .present = 0, \
unchecked_isa_dma : 0, \ .unchecked_isa_dma = 0, \
use_clustering : ENABLE_CLUSTERING, \ .use_clustering = ENABLE_CLUSTERING, \
highmem_io : 1 \ .highmem_io = 1 \
} }
#endif #endif
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7