Commit 0e790473 authored by Art Haas's avatar Art Haas Committed by Linus Torvalds

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

parent a864b859
...@@ -21,19 +21,19 @@ extern int esp_proc_info(char *buffer, char **start, off_t offset, int length, ...@@ -21,19 +21,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_JAZZ_ESP { \ #define SCSI_JAZZ_ESP { \
proc_name: "esp", \ .proc_name = "esp", \
proc_info: &esp_proc_info, \ .proc_info = &esp_proc_info, \
name: "ESP 100/100a/200", \ .name = "ESP 100/100a/200", \
detect: jazz_esp_detect, \ .detect = jazz_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 /* JAZZ_ESP_H */ #endif /* JAZZ_ESP_H */
...@@ -31,34 +31,34 @@ static int lasi700_release(struct Scsi_Host *host); ...@@ -31,34 +31,34 @@ static int lasi700_release(struct Scsi_Host *host);
#define LASI700_SCSI { \ #define LASI700_SCSI { \
name: "LASI SCSI 53c700", \ .name = "LASI SCSI 53c700", \
proc_name: "lasi700", \ .proc_name = "lasi700", \
detect: lasi700_detect, \ .detect = lasi700_detect, \
release: lasi700_release, \ .release = lasi700_release, \
this_id: 7, \ .this_id = 7, \
} }
#define LASI_710_SVERSION 0x082 #define LASI_710_SVERSION 0x082
#define LASI_700_SVERSION 0x071 #define LASI_700_SVERSION 0x071
#define LASI700_ID_TABLE { \ #define LASI700_ID_TABLE { \
hw_type: HPHW_FIO, \ .hw_type = HPHW_FIO, \
sversion: LASI_700_SVERSION, \ .sversion = LASI_700_SVERSION, \
hversion: HVERSION_ANY_ID, \ .hversion = HVERSION_ANY_ID, \
hversion_rev: HVERSION_REV_ANY_ID, \ .hversion_rev = HVERSION_REV_ANY_ID, \
} }
#define LASI710_ID_TABLE { \ #define LASI710_ID_TABLE { \
hw_type: HPHW_FIO, \ .hw_type = HPHW_FIO, \
sversion: LASI_710_SVERSION, \ .sversion = LASI_710_SVERSION, \
hversion: HVERSION_ANY_ID, \ .hversion = HVERSION_ANY_ID, \
hversion_rev: HVERSION_REV_ANY_ID, \ .hversion_rev = HVERSION_REV_ANY_ID, \
} }
#define LASI700_DRIVER { \ #define LASI700_DRIVER { \
name: "Lasi SCSI", \ .name = "Lasi SCSI", \
id_table: lasi700_scsi_tbl, \ .id_table = lasi700_scsi_tbl, \
probe: lasi700_driver_callback,\ .probe = lasi700_driver_callback,\
} }
#define LASI700_CLOCK 25 #define LASI700_CLOCK 25
......
...@@ -15,19 +15,19 @@ int mac53c94_abort(Scsi_Cmnd *); ...@@ -15,19 +15,19 @@ int mac53c94_abort(Scsi_Cmnd *);
int mac53c94_reset(Scsi_Cmnd *, unsigned int); int mac53c94_reset(Scsi_Cmnd *, unsigned int);
#define SCSI_MAC53C94 { \ #define SCSI_MAC53C94 { \
proc_name: "53c94", \ .proc_name = "53c94", \
name: "53C94", \ .name = "53C94", \
detect: mac53c94_detect, \ .detect = mac53c94_detect, \
release: mac53c94_release, \ .release = mac53c94_release, \
command: mac53c94_command, \ .command = mac53c94_command, \
queuecommand: mac53c94_queue, \ .queuecommand = mac53c94_queue, \
abort: mac53c94_abort, \ .abort = mac53c94_abort, \
reset: mac53c94_reset, \ .reset = mac53c94_reset, \
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, \
use_clustering: DISABLE_CLUSTERING, \ .use_clustering = DISABLE_CLUSTERING, \
} }
/* /*
......
...@@ -21,20 +21,20 @@ extern int esp_abort(Scsi_Cmnd *); ...@@ -21,20 +21,20 @@ extern int esp_abort(Scsi_Cmnd *);
extern int esp_reset(Scsi_Cmnd *, unsigned int); extern int esp_reset(Scsi_Cmnd *, unsigned int);
#define SCSI_MAC_ESP { proc_name: "esp", \ #define SCSI_MAC_ESP { .proc_name = "esp", \
name: "Mac 53C9x SCSI", \ .name = "Mac 53C9x SCSI", \
detect: mac_esp_detect, \ .detect = mac_esp_detect, \
release: NULL, \ .release = NULL, \
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 /* MAC_ESP_H */ #endif /* MAC_ESP_H */
...@@ -65,19 +65,19 @@ int macscsi_proc_info (char *buffer, char **start, off_t offset, ...@@ -65,19 +65,19 @@ int macscsi_proc_info (char *buffer, char **start, off_t offset,
#include <scsi/scsicam.h> #include <scsi/scsicam.h>
#define MAC_NCR5380 { \ #define MAC_NCR5380 { \
name: "Macintosh NCR5380 SCSI", \ .name = "Macintosh NCR5380 SCSI", \
detect: macscsi_detect, \ .detect = macscsi_detect, \
release: macscsi_release, /* Release */ \ .release = macscsi_release, /* Release */ \
info: macscsi_info, \ .info = macscsi_info, \
queuecommand: macscsi_queue_command, \ .queuecommand = macscsi_queue_command, \
abort: macscsi_abort, \ .abort = macscsi_abort, \
reset: macscsi_reset, \ .reset = macscsi_reset, \
can_queue: CAN_QUEUE, /* can queue */ \ .can_queue = CAN_QUEUE, /* can queue */ \
this_id: 7, /* id */ \ .this_id = 7, /* id */ \
sg_tablesize: SG_ALL, /* sg_tablesize */ \ .sg_tablesize = SG_ALL, /* sg_tablesize */ \
cmd_per_lun: CMD_PER_LUN, /* cmd per lun */ \ .cmd_per_lun = CMD_PER_LUN, /* cmd per lun */ \
unchecked_isa_dma: 0, /* unchecked_isa_dma */ \ .unchecked_isa_dma = 0, /* unchecked_isa_dma */ \
use_clustering: DISABLE_CLUSTERING \ .use_clustering = DISABLE_CLUSTERING \
} }
#ifndef HOSTS_C #ifndef HOSTS_C
......
...@@ -31,18 +31,18 @@ extern int esp_proc_info(char *buffer, char **start, off_t offset, int length, ...@@ -31,18 +31,18 @@ extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout); int hostno, int inout);
#define MCA_53C9X { proc_name: "esp", \ #define MCA_53C9X { .proc_name = "esp", \
name: "NCR 53c9x SCSI", \ .name = "NCR 53c9x SCSI", \
detect: mca_esp_detect, \ .detect = mca_esp_detect, \
release: mca_esp_release, \ .release = mca_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, \
sg_tablesize: SG_ALL, \ .sg_tablesize = SG_ALL, \
cmd_per_lun: 1, \ .cmd_per_lun = 1, \
unchecked_isa_dma: 1, \ .unchecked_isa_dma = 1, \
use_clustering: DISABLE_CLUSTERING } .use_clustering = DISABLE_CLUSTERING }
/* Ports the ncr's 53c94 can be put at; indexed by pos register value */ /* Ports the ncr's 53c94 can be put at; indexed by pos register value */
......
...@@ -207,22 +207,22 @@ ...@@ -207,22 +207,22 @@
#else #else
#define MEGARAID \ #define MEGARAID \
{\ {\
name: "MegaRAID", /* Driver Name */\ .name = "MegaRAID", /* Driver Name */\
proc_info: megaraid_proc_info, /* /proc driver info */\ .proc_info = megaraid_proc_info, /* /proc driver info */\
detect: megaraid_detect, /* Detect Host Adapter */\ .detect = megaraid_detect, /* Detect Host Adapter */\
release: megaraid_release, /* Release Host Adapter */\ .release = megaraid_release, /* Release Host Adapter */\
info: megaraid_info, /* Driver Info Function */\ .info = megaraid_info, /* Driver Info Function */\
command: megaraid_command, /* Command Function */\ .command = megaraid_command, /* Command Function */\
queuecommand: megaraid_queue, /* Queue Command Function */\ .queuecommand = megaraid_queue, /* Queue Command Function */\
bios_param: megaraid_biosparam, /* Disk BIOS Parameters */\ .bios_param = megaraid_biosparam, /* Disk BIOS Parameters */\
can_queue: MAX_COMMANDS, /* Can Queue */\ .can_queue = MAX_COMMANDS, /* Can Queue */\
this_id: 7, /* HBA Target ID */\ .this_id = 7, /* HBA Target ID */\
sg_tablesize: MAX_SGLIST, /* Scatter/Gather Table Size */\ .sg_tablesize = MAX_SGLIST, /* Scatter/Gather Table Size */\
cmd_per_lun: MAX_CMD_PER_LUN, /* SCSI Commands per LUN */\ .cmd_per_lun = MAX_CMD_PER_LUN, /* SCSI Commands per LUN */\
present: 0, /* Present */\ .present = 0, /* Present */\
unchecked_isa_dma: 0, /* Default Unchecked ISA DMA */\ .unchecked_isa_dma = 0, /* Default Unchecked ISA DMA */\
use_clustering: ENABLE_CLUSTERING, /* Enable Clustering */\ .use_clustering = ENABLE_CLUSTERING, /* Enable Clustering */\
highmem_io: 1, \ .highmem_io = 1, \
} }
#endif #endif
......
...@@ -14,21 +14,21 @@ int mesh_abort(Scsi_Cmnd *); ...@@ -14,21 +14,21 @@ int mesh_abort(Scsi_Cmnd *);
int mesh_host_reset(Scsi_Cmnd *); int mesh_host_reset(Scsi_Cmnd *);
#define SCSI_MESH { \ #define SCSI_MESH { \
proc_name: "mesh", \ .proc_name = "mesh", \
name: "MESH", \ .name = "MESH", \
detect: mesh_detect, \ .detect = mesh_detect, \
release: mesh_release, \ .release = mesh_release, \
command: NULL, \ .command = NULL, \
queuecommand: mesh_queue, \ .queuecommand = mesh_queue, \
eh_abort_handler: mesh_abort, \ .eh_abort_handler = mesh_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: mesh_host_reset, \ .eh_host_reset_handler = mesh_host_reset, \
can_queue: 20, \ .can_queue = 20, \
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, \
} }
/* /*
......
...@@ -31,19 +31,19 @@ int wd33c93_reset(Scsi_Cmnd *, unsigned int); ...@@ -31,19 +31,19 @@ int wd33c93_reset(Scsi_Cmnd *, unsigned int);
#ifdef HOSTS_C #ifdef HOSTS_C
#define MVME147_SCSI {proc_name: "MVME147", \ #define MVME147_SCSI {.proc_name = "MVME147", \
proc_info: NULL, \ .proc_info = NULL, \
name: "MVME147 built-in SCSI", \ .name = "MVME147 built-in SCSI", \
detect: mvme147_detect, \ .detect = mvme147_detect, \
release: mvme147_release, \ .release = mvme147_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 }
#endif /* else def HOSTS_C */ #endif /* else def HOSTS_C */
......
...@@ -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 MVME16x_SCSI {name: "MVME16x NCR53c710 SCSI", \ #define MVME16x_SCSI {.name = "MVME16x NCR53c710 SCSI", \
detect: mvme16x_scsi_detect, \ .detect = mvme16x_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 /* MVME16x_SCSI_H */ #endif /* MVME16x_SCSI_H */
...@@ -70,19 +70,19 @@ int ncr53c8xx_release(struct Scsi_Host *); ...@@ -70,19 +70,19 @@ int ncr53c8xx_release(struct Scsi_Host *);
#if LINUX_VERSION_CODE >= LinuxVersionCode(2,1,75) #if LINUX_VERSION_CODE >= LinuxVersionCode(2,1,75)
#define NCR53C8XX { name: "", \ #define NCR53C8XX { .name = "", \
detect: ncr53c8xx_detect, \ .detect = ncr53c8xx_detect, \
release: ncr53c8xx_release, \ .release = ncr53c8xx_release, \
info: ncr53c8xx_info, \ .info = ncr53c8xx_info, \
queuecommand: ncr53c8xx_queue_command,\ .queuecommand = ncr53c8xx_queue_command,\
slave_configure:ncr53c8xx_slave_configure,\ .slave_configure = ncr53c8xx_slave_configure,\
abort: ncr53c8xx_abort, \ .abort = ncr53c8xx_abort, \
reset: ncr53c8xx_reset, \ .reset = ncr53c8xx_reset, \
can_queue: SCSI_NCR_CAN_QUEUE, \ .can_queue = SCSI_NCR_CAN_QUEUE, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: SCSI_NCR_SG_TABLESIZE, \ .sg_tablesize = SCSI_NCR_SG_TABLESIZE, \
cmd_per_lun: SCSI_NCR_CMD_PER_LUN, \ .cmd_per_lun = SCSI_NCR_CMD_PER_LUN, \
use_clustering: DISABLE_CLUSTERING} .use_clustering = DISABLE_CLUSTERING}
#else #else
......
...@@ -40,18 +40,18 @@ extern int esp_proc_info(char *buffer, char **start, off_t offset, int length, ...@@ -40,18 +40,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_OKTAGON_ESP { \ #define SCSI_OKTAGON_ESP { \
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", \
detect: oktagon_esp_detect, \ .detect = oktagon_esp_detect, \
release: oktagon_esp_release, \ .release = oktagon_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 /* OKTAGON_ESP_H */ #endif /* OKTAGON_ESP_H */
...@@ -144,19 +144,19 @@ static int pas16_proc_info (char *buffer ,char **start, off_t offset, ...@@ -144,19 +144,19 @@ static int pas16_proc_info (char *buffer ,char **start, off_t offset,
*/ */
#define MV_PAS16 { \ #define MV_PAS16 { \
name: "Pro Audio Spectrum-16 SCSI", \ .name = "Pro Audio Spectrum-16 SCSI", \
detect: pas16_detect, \ .detect = pas16_detect, \
queuecommand: pas16_queue_command, \ .queuecommand = pas16_queue_command, \
eh_abort_handler: pas16_abort, \ .eh_abort_handler = pas16_abort, \
eh_bus_reset_handler: pas16_bus_reset, \ .eh_bus_reset_handler = pas16_bus_reset, \
eh_device_reset_handler: pas16_device_reset, \ .eh_device_reset_handler = pas16_device_reset, \
eh_host_reset_handler: pas16_host_reset, \ .eh_host_reset_handler = pas16_host_reset, \
bios_param: pas16_biosparam, \ .bios_param = pas16_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
......
...@@ -203,22 +203,22 @@ int Pci2000_BiosParam (struct scsi_device *sdev, ...@@ -203,22 +203,22 @@ int Pci2000_BiosParam (struct scsi_device *sdev,
/* screen is 80 columns wide, damnit! */ /* screen is 80 columns wide, damnit! */
#define PCI2000 { \ #define PCI2000 { \
proc_name: "pci2000", \ .proc_name = "pci2000", \
name: "PCI-2000 SCSI Intelligent Disk Controller", \ .name = "PCI-2000 SCSI Intelligent Disk Controller", \
detect: Pci2000_Detect, \ .detect = Pci2000_Detect, \
release: Pci2000_Release, \ .release = Pci2000_Release, \
command: Pci2000_Command, \ .command = Pci2000_Command, \
queuecommand: Pci2000_QueueCommand, \ .queuecommand = Pci2000_QueueCommand, \
abort: Pci2000_Abort, \ .abort = Pci2000_Abort, \
reset: Pci2000_Reset, \ .reset = Pci2000_Reset, \
bios_param: Pci2000_BiosParam, \ .bios_param = Pci2000_BiosParam, \
can_queue: 16, \ .can_queue = 16, \
this_id: -1, \ .this_id = -1, \
sg_tablesize: 16, \ .sg_tablesize = 16, \
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
...@@ -42,21 +42,21 @@ int Pci2220i_BiosParam (struct scsi_device *sdev, ...@@ -42,21 +42,21 @@ int Pci2220i_BiosParam (struct scsi_device *sdev,
#endif #endif
#define PCI2220I { \ #define PCI2220I { \
proc_name: "pci2220i", \ .proc_name = "pci2220i", \
name: "PCI-2220I/PCI-2240I", \ .name = "PCI-2220I/PCI-2240I", \
detect: Pci2220i_Detect, \ .detect = Pci2220i_Detect, \
release: Pci2220i_Release, \ .release = Pci2220i_Release, \
command: Pci2220i_Command, \ .command = Pci2220i_Command, \
queuecommand: Pci2220i_QueueCommand, \ .queuecommand = Pci2220i_QueueCommand, \
abort: Pci2220i_Abort, \ .abort = Pci2220i_Abort, \
reset: Pci2220i_Reset, \ .reset = Pci2220i_Reset, \
bios_param: Pci2220i_BiosParam, \ .bios_param = Pci2220i_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: DISABLE_CLUSTERING, \ .use_clustering = DISABLE_CLUSTERING, \
} }
#endif #endif
...@@ -44,21 +44,21 @@ const char * pluto_info(struct Scsi_Host *); ...@@ -44,21 +44,21 @@ const char * pluto_info(struct Scsi_Host *);
int pluto_slave_configure(Scsi_Device *); int pluto_slave_configure(Scsi_Device *);
#define PLUTO { \ #define PLUTO { \
name: "Sparc Storage Array 100/200", \ .name = "Sparc Storage Array 100/200", \
detect: pluto_detect, \ .detect = pluto_detect, \
release: pluto_release, \ .release = pluto_release, \
info: pluto_info, \ .info = pluto_info, \
queuecommand: fcp_scsi_queuecommand, \ .queuecommand = fcp_scsi_queuecommand, \
slave_configure: pluto_slave_configure, \ .slave_configure = pluto_slave_configure, \
can_queue: PLUTO_CAN_QUEUE, \ .can_queue = PLUTO_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 /* !(_PLUTO_H) */ #endif /* !(_PLUTO_H) */
......
...@@ -171,21 +171,21 @@ int ppa_proc_info(char *, char **, off_t, int, int, int); ...@@ -171,21 +171,21 @@ int ppa_proc_info(char *, char **, off_t, int, int, int);
int ppa_biosparam(struct scsi_device *, struct block_device *, int ppa_biosparam(struct scsi_device *, struct block_device *,
sector_t, int *); sector_t, int *);
#define PPA { proc_name: "ppa", \ #define PPA { .proc_name = "ppa", \
proc_info: ppa_proc_info, \ .proc_info = ppa_proc_info, \
name: "Iomega VPI0 (ppa) interface",\ .name = "Iomega VPI0 (ppa) interface",\
detect: ppa_detect, \ .detect = ppa_detect, \
release: ppa_release, \ .release = ppa_release, \
command: ppa_command, \ .command = ppa_command, \
queuecommand: ppa_queuecommand, \ .queuecommand = ppa_queuecommand, \
eh_abort_handler: ppa_abort, \ .eh_abort_handler = ppa_abort, \
eh_device_reset_handler: NULL, \ .eh_device_reset_handler = NULL, \
eh_bus_reset_handler: ppa_reset, \ .eh_bus_reset_handler = ppa_reset, \
eh_host_reset_handler: ppa_reset, \ .eh_host_reset_handler = ppa_reset, \
bios_param: ppa_biosparam, \ .bios_param = ppa_biosparam, \
this_id: -1, \ .this_id = -1, \
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 /* _PPA_H */ #endif /* _PPA_H */
...@@ -321,18 +321,18 @@ int Psi240i_BiosParam (struct scsi_device *sdev, struct block_device *bdev, ...@@ -321,18 +321,18 @@ int Psi240i_BiosParam (struct scsi_device *sdev, struct block_device *bdev,
#define NULL 0 #define NULL 0
#endif #endif
#define PSI240I { proc_name: "psi240i", \ #define PSI240I { .proc_name = "psi240i", \
name: "PSI-240I EIDE Disk Controller",\ .name = "PSI-240I EIDE Disk Controller",\
detect: Psi240i_Detect, \ .detect = Psi240i_Detect, \
command: Psi240i_Command, \ .command = Psi240i_Command, \
queuecommand: Psi240i_QueueCommand, \ .queuecommand = Psi240i_QueueCommand, \
abort: Psi240i_Abort, \ .abort = Psi240i_Abort, \
reset: Psi240i_Reset, \ .reset = Psi240i_Reset, \
bios_param: Psi240i_BiosParam, \ .bios_param = Psi240i_BiosParam, \
can_queue: 1, \ .can_queue = 1, \
this_id: -1, \ .this_id = -1, \
sg_tablesize: SG_NONE, \ .sg_tablesize = SG_NONE, \
cmd_per_lun: 1, \ .cmd_per_lun = 1, \
use_clustering: DISABLE_CLUSTERING } .use_clustering = DISABLE_CLUSTERING }
#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