Skip to content

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

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

parent 0e790473
Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 184 deletions
drivers/scsi/qla1280.h
View file @ 245d1d15
...@@ -1325,25 +1325,25 @@ void qla1280_setup(char *s, int *dummy); ...@@ -1325,25 +1325,25 @@ void qla1280_setup(char *s, int *dummy);
*/ */
#define QLA1280_LINUX_TEMPLATE { \ #define QLA1280_LINUX_TEMPLATE { \
proc_info: qla1280_proc_info, \ .proc_info = qla1280_proc_info, \
name: "Qlogic ISP 1280/12160", \ .name = "Qlogic ISP 1280/12160", \
detect: qla1280_detect, \ .detect = qla1280_detect, \
release: qla1280_release, \ .release = qla1280_release, \
info: qla1280_info, \ .info = qla1280_info, \
queuecommand: qla1280_queuecommand, \ .queuecommand = qla1280_queuecommand, \
/* use_new_eh_code: 0, */ \ /* use_new_eh_code: 0, */ \
abort: qla1280_abort, \ .abort = qla1280_abort, \
reset: qla1280_reset, \ .reset = qla1280_reset, \
slave_configure: qla1280_slave_configure, \ .slave_configure = qla1280_slave_configure, \
bios_param: qla1280_biosparam, \ .bios_param = qla1280_biosparam, \
can_queue: 255, /* max simultaneous cmds */\ .can_queue = 255, /* max simultaneous cmds */\
this_id: -1, /* scsi id of host adapter */\ .this_id = -1, /* scsi id of host adapter */\
sg_tablesize: SG_ALL, /* max scatter-gather cmds */\ .sg_tablesize = SG_ALL, /* max scatter-gather cmds */\
cmd_per_lun: 3, /* cmds per lun (linked cmds) */\ .cmd_per_lun = 3, /* cmds per lun (linked cmds) */\
present: 0, /* number of 1280's present */\ .present = 0, /* number of 1280'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, \
emulated: 0 \ .emulated = 0 \
} }
#endif /* _IO_HBA_QLA1280_H */ #endif /* _IO_HBA_QLA1280_H */
drivers/scsi/qlogicfas.h
View file @ 245d1d15
...@@ -13,20 +13,20 @@ static int qlogicfas_biosparam(struct scsi_device *, struct block_device *, ...@@ -13,20 +13,20 @@ static int qlogicfas_biosparam(struct scsi_device *, struct block_device *,
sector_t, int[]); sector_t, int[]);
#define QLOGICFAS { \ #define QLOGICFAS { \
detect: qlogicfas_detect, \ .detect = qlogicfas_detect, \
info: qlogicfas_info, \ .info = qlogicfas_info, \
command: qlogicfas_command, \ .command = qlogicfas_command, \
queuecommand: qlogicfas_queuecommand, \ .queuecommand = qlogicfas_queuecommand, \
eh_abort_handler: qlogicfas_abort, \ .eh_abort_handler = qlogicfas_abort, \
eh_bus_reset_handler: qlogicfas_bus_reset, \ .eh_bus_reset_handler = qlogicfas_bus_reset, \
eh_device_reset_handler: qlogicfas_device_reset, \ .eh_device_reset_handler = qlogicfas_device_reset, \
eh_host_reset_handler: qlogicfas_host_reset, \ .eh_host_reset_handler = qlogicfas_host_reset, \
bios_param: qlogicfas_biosparam, \ .bios_param = qlogicfas_biosparam, \
can_queue: 0, \ .can_queue = 0, \
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 \
} }
#endif /* _QLOGICFAS_H */ #endif /* _QLOGICFAS_H */
......
drivers/scsi/qlogicfc.h
View file @ 245d1d15
...@@ -83,20 +83,20 @@ int isp2x00_biosparam(struct scsi_device *, struct block_device *, ...@@ -83,20 +83,20 @@ int isp2x00_biosparam(struct scsi_device *, struct block_device *,
#endif #endif
#define QLOGICFC { \ #define QLOGICFC { \
detect: isp2x00_detect, \ .detect = isp2x00_detect, \
release: isp2x00_release, \ .release = isp2x00_release, \
info: isp2x00_info, \ .info = isp2x00_info, \
queuecommand: isp2x00_queuecommand, \ .queuecommand = isp2x00_queuecommand, \
eh_abort_handler: isp2x00_abort, \ .eh_abort_handler = isp2x00_abort, \
bios_param: isp2x00_biosparam, \ .bios_param = isp2x00_biosparam, \
can_queue: QLOGICFC_REQ_QUEUE_LEN, \ .can_queue = QLOGICFC_REQ_QUEUE_LEN, \
this_id: -1, \ .this_id = -1, \
sg_tablesize: QLOGICFC_MAX_SG(QLOGICFC_REQ_QUEUE_LEN), \ .sg_tablesize = QLOGICFC_MAX_SG(QLOGICFC_REQ_QUEUE_LEN), \
cmd_per_lun: QLOGICFC_CMD_PER_LUN, \ .cmd_per_lun = QLOGICFC_CMD_PER_LUN, \
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 /* _QLOGICFC_H */ #endif /* _QLOGICFC_H */
......
drivers/scsi/qlogicisp.h
View file @ 245d1d15
...@@ -72,18 +72,18 @@ int isp1020_biosparam(struct scsi_device *, struct block_device *, ...@@ -72,18 +72,18 @@ int isp1020_biosparam(struct scsi_device *, struct block_device *,
#endif #endif
#define QLOGICISP { \ #define QLOGICISP { \
detect: isp1020_detect, \ .detect = isp1020_detect, \
release: isp1020_release, \ .release = isp1020_release, \
info: isp1020_info, \ .info = isp1020_info, \
queuecommand: isp1020_queuecommand, \ .queuecommand = isp1020_queuecommand, \
bios_param: isp1020_biosparam, \ .bios_param = isp1020_biosparam, \
can_queue: QLOGICISP_REQ_QUEUE_LEN, \ .can_queue = QLOGICISP_REQ_QUEUE_LEN, \
this_id: -1, \ .this_id = -1, \
sg_tablesize: QLOGICISP_MAX_SG(QLOGICISP_REQ_QUEUE_LEN), \ .sg_tablesize = QLOGICISP_MAX_SG(QLOGICISP_REQ_QUEUE_LEN), \
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 /* _QLOGICISP_H */ #endif /* _QLOGICISP_H */
drivers/scsi/scsi_debug.c
View file @ 245d1d15
...@@ -1636,8 +1636,8 @@ static int pseudo_lld_bus_match(struct device *dev, ...@@ -1636,8 +1636,8 @@ static int pseudo_lld_bus_match(struct device *dev,
} }
static struct bus_type pseudo_lld_bus = { static struct bus_type pseudo_lld_bus = {
name: "pseudo", .name = "pseudo",
match: pseudo_lld_bus_match, .match = pseudo_lld_bus_match,
}; };
int scsi_debug_register_driver(struct device_driver *dev_driver) int scsi_debug_register_driver(struct device_driver *dev_driver)
......
drivers/scsi/seagate.h
View file @ 245d1d15
...@@ -19,19 +19,19 @@ static int seagate_st0x_bus_reset(Scsi_Cmnd *); ...@@ -19,19 +19,19 @@ static int seagate_st0x_bus_reset(Scsi_Cmnd *);
static int seagate_st0x_device_reset(Scsi_Cmnd *); static int seagate_st0x_device_reset(Scsi_Cmnd *);
static int seagate_st0x_host_reset(Scsi_Cmnd *); static int seagate_st0x_host_reset(Scsi_Cmnd *);
#define SEAGATE_ST0X { detect: seagate_st0x_detect, \ #define SEAGATE_ST0X { .detect = seagate_st0x_detect, \
release: seagate_st0x_release, \ .release = seagate_st0x_release, \
info: seagate_st0x_info, \ .info = seagate_st0x_info, \
command: seagate_st0x_command, \ .command = seagate_st0x_command, \
queuecommand: seagate_st0x_queue_command, \ .queuecommand = seagate_st0x_queue_command, \
eh_abort_handler: seagate_st0x_abort, \ .eh_abort_handler = seagate_st0x_abort, \
eh_bus_reset_handler: seagate_st0x_bus_reset, \ .eh_bus_reset_handler = seagate_st0x_bus_reset, \
eh_host_reset_handler: seagate_st0x_host_reset, \ .eh_host_reset_handler = seagate_st0x_host_reset, \
eh_device_reset_handler:seagate_st0x_device_reset, \ .eh_device_reset_handler = seagate_st0x_device_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}
#endif /* _SEAGATE_H */ #endif /* _SEAGATE_H */
drivers/scsi/sgiwd93.h
View file @ 245d1d15
...@@ -25,17 +25,17 @@ int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); ...@@ -25,17 +25,17 @@ int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
int wd33c93_abort(Scsi_Cmnd *); int wd33c93_abort(Scsi_Cmnd *);
int wd33c93_reset(Scsi_Cmnd *, unsigned int); int wd33c93_reset(Scsi_Cmnd *, unsigned int);
#define SGIWD93_SCSI {proc_name: "SGIWD93", \ #define SGIWD93_SCSI {.proc_name = "SGIWD93", \
name: "SGI WD93", \ .name = "SGI WD93", \
detect: sgiwd93_detect, \ .detect = sgiwd93_detect, \
release: sgiwd93_release, \ .release = sgiwd93_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 }
#endif /* !(_SGIWD93_H) */ #endif /* !(_SGIWD93_H) */
drivers/scsi/sim710.h
View file @ 245d1d15
...@@ -22,20 +22,20 @@ int sim710_release(struct Scsi_Host *); ...@@ -22,20 +22,20 @@ int sim710_release(struct Scsi_Host *);
#include <scsi/scsicam.h> #include <scsi/scsicam.h>
#define SIM710_SCSI { proc_name: "sim710", \ #define SIM710_SCSI { .proc_name = "sim710", \
name: "53c710", \ .name = "53c710", \
detect: sim710_detect, \ .detect = sim710_detect, \
release: sim710_release, \ .release = sim710_release, \
queuecommand: sim710_queuecommand, \ .queuecommand = sim710_queuecommand, \
eh_abort_handler: sim710_abort, \ .eh_abort_handler = sim710_abort, \
eh_device_reset_handler: sim710_dev_reset, \ .eh_device_reset_handler = sim710_dev_reset, \
eh_bus_reset_handler: sim710_bus_reset, \ .eh_bus_reset_handler = sim710_bus_reset, \
eh_host_reset_handler: sim710_host_reset, \ .eh_host_reset_handler = sim710_host_reset, \
can_queue: 8, \ .can_queue = 8, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: 128, \ .sg_tablesize = 128, \
cmd_per_lun: 1, \ .cmd_per_lun = 1, \
use_clustering: DISABLE_CLUSTERING } .use_clustering = DISABLE_CLUSTERING }
#ifndef HOSTS_C #ifndef HOSTS_C
......
drivers/scsi/sun3x_esp.h
View file @ 245d1d15
...@@ -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,
#define DMA_PORTS_P (dregs->cond_reg & DMA_INT_ENAB) #define DMA_PORTS_P (dregs->cond_reg & DMA_INT_ENAB)
#define SCSI_SUN3X_ESP { \ #define SCSI_SUN3X_ESP { \
proc_name: "esp", \ .proc_name = "esp", \
proc_info: &esp_proc_info, \ .proc_info = &esp_proc_info, \
name: "Sun ESP 100/100a/200", \ .name = "Sun ESP 100/100a/200", \
detect: sun3x_esp_detect, \ .detect = sun3x_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 /* !(_SUN3X_ESP_H) */ #endif /* !(_SUN3X_ESP_H) */
drivers/scsi/sym53c8xx.h
View file @ 245d1d15
...@@ -85,21 +85,21 @@ int sym53c8xx_release(struct Scsi_Host *); ...@@ -85,21 +85,21 @@ int sym53c8xx_release(struct Scsi_Host *);
#if LINUX_VERSION_CODE >= LinuxVersionCode(2,1,75) #if LINUX_VERSION_CODE >= LinuxVersionCode(2,1,75)
#define SYM53C8XX { name: "", \ #define SYM53C8XX { .name = "", \
detect: sym53c8xx_detect, \ .detect = sym53c8xx_detect, \
release: sym53c8xx_release, \ .release = sym53c8xx_release, \
info: sym53c8xx_info, \ .info = sym53c8xx_info, \
queuecommand: sym53c8xx_queue_command,\ .queuecommand = sym53c8xx_queue_command,\
slave_configure:sym53c8xx_slave_configure,\ .slave_configure = sym53c8xx_slave_configure,\
abort: sym53c8xx_abort, \ .abort = sym53c8xx_abort, \
reset: sym53c8xx_reset, \ .reset = sym53c8xx_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, \
max_sectors: MAX_HW_SEGMENTS*8, \ .max_sectors = MAX_HW_SEGMENTS*8, \
use_clustering: DISABLE_CLUSTERING, \ .use_clustering = DISABLE_CLUSTERING, \
highmem_io: 1} .highmem_io = 1}
#else #else
......
drivers/scsi/t128.h
View file @ 245d1d15
...@@ -121,19 +121,19 @@ static int t128_proc_info (char *buffer, char **start, off_t offset, ...@@ -121,19 +121,19 @@ static int t128_proc_info (char *buffer, char **start, off_t offset,
*/ */
#define TRANTOR_T128 { \ #define TRANTOR_T128 { \
name: "Trantor T128/T128F/T228", \ .name = "Trantor T128/T128F/T228", \
detect: t128_detect, \ .detect = t128_detect, \
queuecommand: t128_queue_command, \ .queuecommand = t128_queue_command, \
eh_abort_handler: t128_abort, \ .eh_abort_handler = t128_abort, \
eh_bus_reset_handler: t128_bus_reset, \ .eh_bus_reset_handler = t128_bus_reset, \
eh_host_reset_handler: t128_host_reset, \ .eh_host_reset_handler = t128_host_reset, \
eh_device_reset_handler: t128_device_reset, \ .eh_device_reset_handler = t128_device_reset, \
bios_param: t128_biosparam, \ .bios_param = t128_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/u14-34f.h
View file @ 245d1d15
...@@ -13,17 +13,17 @@ static int u14_34f_slave_configure(Scsi_Device *); ...@@ -13,17 +13,17 @@ static int u14_34f_slave_configure(Scsi_Device *);
#define U14_34F_VERSION "8.00.00" #define U14_34F_VERSION "8.00.00"
#define ULTRASTOR_14_34F { \ #define ULTRASTOR_14_34F { \
name: "UltraStor 14F/34F rev. " U14_34F_VERSION " ", \ .name = "UltraStor 14F/34F rev. " U14_34F_VERSION " ", \
detect: u14_34f_detect, \ .detect = u14_34f_detect, \
release: u14_34f_release, \ .release = u14_34f_release, \
queuecommand: u14_34f_queuecommand, \ .queuecommand = u14_34f_queuecommand, \
eh_abort_handler: u14_34f_eh_abort, \ .eh_abort_handler = u14_34f_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: u14_34f_eh_host_reset, \ .eh_host_reset_handler = u14_34f_eh_host_reset, \
bios_param: u14_34f_bios_param, \ .bios_param = u14_34f_bios_param, \
slave_configure: u14_34f_slave_configure, \ .slave_configure = u14_34f_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/ultrastor.h
View file @ 245d1d15
...@@ -30,19 +30,19 @@ static int ultrastor_biosparam(struct scsi_device *, struct block_device *, sect ...@@ -30,19 +30,19 @@ static int ultrastor_biosparam(struct scsi_device *, struct block_device *, sect
#define ULTRASTOR_24F_PORT 0xC80 #define ULTRASTOR_24F_PORT 0xC80
#define ULTRASTOR_14F { name: "UltraStor 14F/24F/34F", \ #define ULTRASTOR_14F { .name = "UltraStor 14F/24F/34F", \
detect: ultrastor_detect, \ .detect = ultrastor_detect, \
info: ultrastor_info, \ .info = ultrastor_info, \
queuecommand: ultrastor_queuecommand, \ .queuecommand = ultrastor_queuecommand, \
eh_abort_handler: ultrastor_abort, \ .eh_abort_handler = ultrastor_abort, \
eh_host_reset_handler: ultrastor_host_reset, \ .eh_host_reset_handler = ultrastor_host_reset, \
bios_param: ultrastor_biosparam, \ .bios_param = ultrastor_biosparam, \
can_queue: ULTRASTOR_MAX_CMDS, \ .can_queue = ULTRASTOR_MAX_CMDS, \
this_id: 0, \ .this_id = 0, \
sg_tablesize: ULTRASTOR_14F_MAX_SG, \ .sg_tablesize = ULTRASTOR_14F_MAX_SG, \
cmd_per_lun: ULTRASTOR_MAX_CMDS_PER_LUN,\ .cmd_per_lun = ULTRASTOR_MAX_CMDS_PER_LUN,\
unchecked_isa_dma: 1, \ .unchecked_isa_dma = 1, \
use_clustering: ENABLE_CLUSTERING } .use_clustering = ENABLE_CLUSTERING }
#ifdef ULTRASTOR_PRIVATE #ifdef ULTRASTOR_PRIVATE
......
drivers/scsi/wd7000.h
View file @ 245d1d15
...@@ -44,21 +44,21 @@ static int wd7000_biosparam(struct scsi_device *, struct block_device *, ...@@ -44,21 +44,21 @@ static int wd7000_biosparam(struct scsi_device *, struct block_device *,
#define WD7000_SG 16 #define WD7000_SG 16
#define WD7000 { \ #define WD7000 { \
proc_name: "wd7000", \ .proc_name = "wd7000", \
proc_info: wd7000_proc_info, \ .proc_info = wd7000_proc_info, \
name: "Western Digital WD-7000", \ .name = "Western Digital WD-7000", \
detect: wd7000_detect, \ .detect = wd7000_detect, \
command: wd7000_command, \ .command = wd7000_command, \
queuecommand: wd7000_queuecommand, \ .queuecommand = wd7000_queuecommand, \
eh_bus_reset_handler: wd7000_bus_reset, \ .eh_bus_reset_handler = wd7000_bus_reset, \
eh_device_reset_handler:wd7000_device_reset, \ .eh_device_reset_handler = wd7000_device_reset, \
eh_host_reset_handler: wd7000_host_reset, \ .eh_host_reset_handler = wd7000_host_reset, \
bios_param: wd7000_biosparam, \ .bios_param = wd7000_biosparam, \
can_queue: WD7000_Q, \ .can_queue = WD7000_Q, \
this_id: 7, \ .this_id = 7, \
sg_tablesize: WD7000_SG, \ .sg_tablesize = WD7000_SG, \
cmd_per_lun: 1, \ .cmd_per_lun = 1, \
unchecked_isa_dma: 1, \ .unchecked_isa_dma = 1, \
use_clustering: ENABLE_CLUSTERING, \ .use_clustering = ENABLE_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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7