]> git.hungrycats.org Git - linux/commitdiff
[PATCH] C99 initializers for drivers/scsi (4 of 4)
authorArt Haas <ahaas@airmail.net>
Sun, 15 Dec 2002 08:13:51 +0000 (00:13 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Sun, 15 Dec 2002 08:13:51 +0000 (00:13 -0800)
14 files changed:
drivers/scsi/qla1280.h
drivers/scsi/qlogicfas.h
drivers/scsi/qlogicfc.h
drivers/scsi/qlogicisp.h
drivers/scsi/scsi_debug.c
drivers/scsi/seagate.h
drivers/scsi/sgiwd93.h
drivers/scsi/sim710.h
drivers/scsi/sun3x_esp.h
drivers/scsi/sym53c8xx.h
drivers/scsi/t128.h
drivers/scsi/u14-34f.h
drivers/scsi/ultrastor.h
drivers/scsi/wd7000.h

index 600471d4367d8bf69b0b6c240295b3c906a1c874..21e79aed05da517a25c06d3f18824f293d012a01 100644 (file)
@@ -1325,25 +1325,25 @@ void qla1280_setup(char *s, int *dummy);
  */
 
 #define QLA1280_LINUX_TEMPLATE {                               \
-       proc_info: qla1280_proc_info,                           \
-       name: "Qlogic ISP 1280/12160",                          \
-       detect: qla1280_detect,                                 \
-       release: qla1280_release,                               \
-       info: qla1280_info,                                     \
-       queuecommand: qla1280_queuecommand,                     \
+       .proc_info = qla1280_proc_info,                         \
+       .name = "Qlogic ISP 1280/12160",                                \
+       .detect = qla1280_detect,                                       \
+       .release = qla1280_release,                             \
+       .info = qla1280_info,                                   \
+       .queuecommand = qla1280_queuecommand,                   \
 /*     use_new_eh_code: 0, */                                  \
-       abort: qla1280_abort,                                   \
-       reset: qla1280_reset,                                   \
-       slave_configure: qla1280_slave_configure,               \
-       bios_param: qla1280_biosparam,                          \
-       can_queue: 255,         /* max simultaneous cmds      */\
-       this_id: -1,            /* scsi id of host adapter    */\
-       sg_tablesize: SG_ALL,   /* max scatter-gather cmds    */\
-       cmd_per_lun: 3,         /* cmds per lun (linked cmds) */\
-       present: 0,             /* number of 1280's present   */\
-       unchecked_isa_dma: 0,   /* no memory DMA restrictions */\
-       use_clustering: ENABLE_CLUSTERING,                      \
-       emulated: 0                                             \
+       .abort = qla1280_abort,                                 \
+       .reset = qla1280_reset,                                 \
+       .slave_configure = qla1280_slave_configure,             \
+       .bios_param = qla1280_biosparam,                                \
+       .can_queue = 255,               /* max simultaneous cmds      */\
+       .this_id = -1,          /* scsi id of host adapter    */\
+       .sg_tablesize = SG_ALL, /* max scatter-gather cmds    */\
+       .cmd_per_lun = 3,               /* cmds per lun (linked cmds) */\
+       .present = 0,           /* number of 1280's present   */\
+       .unchecked_isa_dma = 0, /* no memory DMA restrictions */\
+       .use_clustering = ENABLE_CLUSTERING,                    \
+       .emulated = 0                                           \
 }
 
 #endif                         /* _IO_HBA_QLA1280_H */
index 74da123fb56d7e87b4e4e1f446a0e6d6b1b36885..aea30c19ddad63d61854c43f0c43691f712f19bb 100644 (file)
@@ -13,20 +13,20 @@ static int qlogicfas_biosparam(struct scsi_device *, struct block_device *,
                               sector_t, int[]);
 
 #define QLOGICFAS {                                            \
-       detect:                         qlogicfas_detect,       \
-       info:                           qlogicfas_info,         \
-       command:                        qlogicfas_command,      \
-       queuecommand:                   qlogicfas_queuecommand, \
-       eh_abort_handler:               qlogicfas_abort,        \
-       eh_bus_reset_handler:           qlogicfas_bus_reset,    \
-       eh_device_reset_handler:        qlogicfas_device_reset, \
-       eh_host_reset_handler:          qlogicfas_host_reset,   \
-       bios_param:     qlogicfas_biosparam,                    \
-       can_queue:      0,                                      \
-       this_id:        -1,                                     \
-       sg_tablesize:   SG_ALL,                                 \
-       cmd_per_lun:    1,                                      \
-       use_clustering: DISABLE_CLUSTERING                      \
+       .detect                         = qlogicfas_detect,     \
+       .info                           = qlogicfas_info,               \
+       .command                        = qlogicfas_command,    \
+       .queuecommand                   = qlogicfas_queuecommand,       \
+       .eh_abort_handler               = qlogicfas_abort,      \
+       .eh_bus_reset_handler           = qlogicfas_bus_reset,  \
+       .eh_device_reset_handler        = qlogicfas_device_reset,       \
+       .eh_host_reset_handler          = qlogicfas_host_reset, \
+       .bios_param     = qlogicfas_biosparam,                  \
+       .can_queue      = 0,                                    \
+       .this_id        = -1,                                   \
+       .sg_tablesize   = SG_ALL,                                       \
+       .cmd_per_lun    = 1,                                    \
+       .use_clustering = DISABLE_CLUSTERING                    \
 }
 #endif /* _QLOGICFAS_H */
 
index 71f5eadbce4c80740c7af50000899d5ff498afff..6b48a64eb6eb84f190a2bbd6a0d0024b2096a141 100644 (file)
@@ -83,20 +83,20 @@ int isp2x00_biosparam(struct scsi_device *, struct block_device *,
 #endif
 
 #define QLOGICFC {                                                        \
-        detect:                 isp2x00_detect,                            \
-        release:                isp2x00_release,                           \
-        info:                   isp2x00_info,                              \
-        queuecommand:           isp2x00_queuecommand,                      \
-        eh_abort_handler:       isp2x00_abort,                             \
-        bios_param:             isp2x00_biosparam,                         \
-        can_queue:              QLOGICFC_REQ_QUEUE_LEN,                    \
-        this_id:                -1,                                        \
-        sg_tablesize:           QLOGICFC_MAX_SG(QLOGICFC_REQ_QUEUE_LEN),   \
-       cmd_per_lun:            QLOGICFC_CMD_PER_LUN,                      \
-        present:                0,                                         \
-        unchecked_isa_dma:      0,                                         \
-        use_clustering:         ENABLE_CLUSTERING,                        \
-       highmem_io:             1                                          \
+        .detect                 = isp2x00_detect,                            \
+        .release                = isp2x00_release,                           \
+        .info                   = isp2x00_info,                              \
+        .queuecommand           = isp2x00_queuecommand,                      \
+        .eh_abort_handler       = isp2x00_abort,                             \
+        .bios_param             = isp2x00_biosparam,                         \
+        .can_queue              = QLOGICFC_REQ_QUEUE_LEN,                    \
+        .this_id                = -1,                                        \
+        .sg_tablesize           = QLOGICFC_MAX_SG(QLOGICFC_REQ_QUEUE_LEN),   \
+       .cmd_per_lun            = QLOGICFC_CMD_PER_LUN,                            \
+        .present                = 0,                                         \
+        .unchecked_isa_dma      = 0,                                         \
+        .use_clustering         = ENABLE_CLUSTERING,                      \
+       .highmem_io             = 1                                        \
 }
 
 #endif /* _QLOGICFC_H */
index 9dc8d8a8976067ff60d39fbba60efddf34d0d316..54c8ee190fc9f969032daf12a7937894197d039d 100644 (file)
@@ -72,18 +72,18 @@ int isp1020_biosparam(struct scsi_device *, struct block_device *,
 #endif
 
 #define QLOGICISP {                                                       \
-       detect:                 isp1020_detect,                            \
-       release:                isp1020_release,                           \
-       info:                   isp1020_info,                              \
-       queuecommand:           isp1020_queuecommand,                      \
-       bios_param:             isp1020_biosparam,                         \
-       can_queue:              QLOGICISP_REQ_QUEUE_LEN,                   \
-       this_id:                -1,                                        \
-       sg_tablesize:           QLOGICISP_MAX_SG(QLOGICISP_REQ_QUEUE_LEN), \
-       cmd_per_lun:            1,                                         \
-       present:                0,                                         \
-       unchecked_isa_dma:      0,                                         \
-       use_clustering:         DISABLE_CLUSTERING                         \
+       .detect                 = isp1020_detect,                                  \
+       .release                = isp1020_release,                         \
+       .info                   = isp1020_info,                            \
+       .queuecommand           = isp1020_queuecommand,                    \
+       .bios_param             = isp1020_biosparam,                       \
+       .can_queue              = QLOGICISP_REQ_QUEUE_LEN,                 \
+       .this_id                = -1,                                      \
+       .sg_tablesize           = QLOGICISP_MAX_SG(QLOGICISP_REQ_QUEUE_LEN), \
+       .cmd_per_lun            = 1,                                       \
+       .present                = 0,                                       \
+       .unchecked_isa_dma      = 0,                                       \
+       .use_clustering         = DISABLE_CLUSTERING                       \
 }
 
 #endif /* _QLOGICISP_H */
index 60014c979f89b950ca31ce205834a962dee56b5d..fba72df86df31257f2dad34de687834bbf6cf4f8 100644 (file)
@@ -1636,8 +1636,8 @@ static int pseudo_lld_bus_match(struct device *dev,
 }
 
 static struct bus_type pseudo_lld_bus = {
-        name: "pseudo",
-        match: pseudo_lld_bus_match,
+        .name = "pseudo",
+        .match = pseudo_lld_bus_match,
 };
 
 int scsi_debug_register_driver(struct device_driver *dev_driver)
index d15de416162f895a3ca77abc20386d20d7d3094e..ecd96475df978996c7b9c69ef1e1852bcc9b0a2b 100644 (file)
@@ -19,19 +19,19 @@ static int seagate_st0x_bus_reset(Scsi_Cmnd *);
 static int seagate_st0x_device_reset(Scsi_Cmnd *);
 static int seagate_st0x_host_reset(Scsi_Cmnd *);
 
-#define SEAGATE_ST0X  {  detect:         seagate_st0x_detect,                  \
-                        release:        seagate_st0x_release,                  \
-                        info:           seagate_st0x_info,                     \
-                        command:        seagate_st0x_command,                  \
-                        queuecommand:   seagate_st0x_queue_command,            \
-                        eh_abort_handler:      seagate_st0x_abort,             \
-                        eh_bus_reset_handler:  seagate_st0x_bus_reset,         \
-                        eh_host_reset_handler: seagate_st0x_host_reset,        \
-                        eh_device_reset_handler:seagate_st0x_device_reset,     \
-                        can_queue:      1,                                     \
-                        this_id:        7,                                     \
-                        sg_tablesize:   SG_ALL,                                \
-                        cmd_per_lun:    1,                                     \
-                        use_clustering: DISABLE_CLUSTERING}
+#define SEAGATE_ST0X  {  .detect         = seagate_st0x_detect,                        \
+                        .release        = seagate_st0x_release,                        \
+                        .info           = seagate_st0x_info,                   \
+                        .command        = seagate_st0x_command,                        \
+                        .queuecommand   = seagate_st0x_queue_command,          \
+                        .eh_abort_handler      = seagate_st0x_abort,           \
+                        .eh_bus_reset_handler  = seagate_st0x_bus_reset,               \
+                        .eh_host_reset_handler = seagate_st0x_host_reset,      \
+                        .eh_device_reset_handler = seagate_st0x_device_reset,  \
+                        .can_queue      = 1,                                   \
+                        .this_id        = 7,                                   \
+                        .sg_tablesize   = SG_ALL,                              \
+                        .cmd_per_lun    = 1,                                   \
+                        .use_clustering = DISABLE_CLUSTERING}
 
 #endif /* _SEAGATE_H */
index 11bf09a0e13115d1029ca38809d5acd5142b3941..daf2472fecde66ed3897a16dc351b7dc12190787 100644 (file)
@@ -25,17 +25,17 @@ int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 int wd33c93_abort(Scsi_Cmnd *);
 int wd33c93_reset(Scsi_Cmnd *, unsigned int);
 
-#define SGIWD93_SCSI {proc_name:          "SGIWD93", \
-                     name:                "SGI WD93", \
-                     detect:              sgiwd93_detect,    \
-                     release:             sgiwd93_release,   \
-                     queuecommand:        wd33c93_queuecommand, \
-                     abort:               wd33c93_abort,   \
-                     reset:               wd33c93_reset,   \
-                     can_queue:           CAN_QUEUE,       \
-                     this_id:             7,               \
-                     sg_tablesize:        SG_ALL,          \
-                     cmd_per_lun:         CMD_PER_LUN,     \
-                     use_clustering:      DISABLE_CLUSTERING }
+#define SGIWD93_SCSI {.proc_name          = "SGIWD93", \
+                     .name                = "SGI WD93", \
+                     .detect              = sgiwd93_detect,    \
+                     .release             = sgiwd93_release,   \
+                     .queuecommand        = wd33c93_queuecommand, \
+                     .abort               = wd33c93_abort,   \
+                     .reset               = wd33c93_reset,   \
+                     .can_queue           = CAN_QUEUE,       \
+                     .this_id             = 7,               \
+                     .sg_tablesize        = SG_ALL,          \
+                     .cmd_per_lun         = CMD_PER_LUN,     \
+                     .use_clustering      = DISABLE_CLUSTERING }
 
 #endif /* !(_SGIWD93_H) */
index 006c3a3b250cc1724c27a691f686218446ee9ea2..0af7cf34eb68db05d81bdeee279897ec0e1747b6 100644 (file)
@@ -22,20 +22,20 @@ int sim710_release(struct Scsi_Host *);
 
 #include <scsi/scsicam.h>
 
-#define SIM710_SCSI { proc_name:               "sim710",               \
-                     name:                     "53c710",               \
-                     detect:                   sim710_detect,          \
-                     release:                  sim710_release,         \
-                     queuecommand:             sim710_queuecommand,    \
-                     eh_abort_handler:         sim710_abort,           \
-                     eh_device_reset_handler:  sim710_dev_reset,       \
-                     eh_bus_reset_handler:     sim710_bus_reset,       \
-                     eh_host_reset_handler:    sim710_host_reset,      \
-                     can_queue:                8,                      \
-                     this_id:                  7,                      \
-                     sg_tablesize:             128,                    \
-                     cmd_per_lun:              1,                      \
-                     use_clustering:           DISABLE_CLUSTERING }
+#define SIM710_SCSI { .proc_name               = "sim710",             \
+                     .name                     = "53c710",             \
+                     .detect                   = sim710_detect,                \
+                     .release                  = sim710_release,               \
+                     .queuecommand             = sim710_queuecommand,  \
+                     .eh_abort_handler         = sim710_abort,         \
+                     .eh_device_reset_handler  = sim710_dev_reset,     \
+                     .eh_bus_reset_handler     = sim710_bus_reset,     \
+                     .eh_host_reset_handler    = sim710_host_reset,    \
+                     .can_queue                = 8,                    \
+                     .this_id                  = 7,                    \
+                     .sg_tablesize             = 128,                  \
+                     .cmd_per_lun              = 1,                    \
+                     .use_clustering           = DISABLE_CLUSTERING }
 
 #ifndef HOSTS_C
 
index 63bbb69d5b2468f5de8bffef980eb79adc8d4704..653a775ef18520baf29cc99e8a5aa78616ea3e8d 100644 (file)
@@ -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 SCSI_SUN3X_ESP {                                        \
-               proc_name:      "esp",                          \
-               proc_info:      &esp_proc_info,                 \
-               name:           "Sun ESP 100/100a/200",         \
-               detect:         sun3x_esp_detect,               \
-               info:           esp_info,                       \
-               command:        esp_command,                    \
-               queuecommand:   esp_queue,                      \
-               abort:          esp_abort,                      \
-               reset:          esp_reset,                      \
-               can_queue:      7,                              \
-               this_id:        7,                              \
-               sg_tablesize:   SG_ALL,                         \
-               cmd_per_lun:    1,                              \
-               use_clustering: DISABLE_CLUSTERING, }
+               .proc_name      = "esp",                        \
+               .proc_info      = &esp_proc_info,                       \
+               .name           = "Sun ESP 100/100a/200",               \
+               .detect         = sun3x_esp_detect,             \
+               .info           = esp_info,                     \
+               .command        = esp_command,                  \
+               .queuecommand   = esp_queue,                    \
+               .abort          = esp_abort,                    \
+               .reset          = esp_reset,                    \
+               .can_queue      = 7,                            \
+               .this_id        = 7,                            \
+               .sg_tablesize   = SG_ALL,                               \
+               .cmd_per_lun    = 1,                            \
+               .use_clustering = DISABLE_CLUSTERING, }
 
 #endif /* !(_SUN3X_ESP_H) */
index 2e9a7b2b545d9483c3c4ef3149397a4602b8b893..f2f0640cfb39b5edd2ac0b588773cceb8e81452a 100644 (file)
@@ -85,21 +85,21 @@ int sym53c8xx_release(struct Scsi_Host *);
 
 #if    LINUX_VERSION_CODE >= LinuxVersionCode(2,1,75)
 
-#define SYM53C8XX {     name:           "",                    \
-                       detect:         sym53c8xx_detect,       \
-                       release:        sym53c8xx_release,      \
-                       info:           sym53c8xx_info,         \
-                       queuecommand:   sym53c8xx_queue_command,\
-                       slave_configure:sym53c8xx_slave_configure,\
-                       abort:          sym53c8xx_abort,        \
-                       reset:          sym53c8xx_reset,        \
-                       can_queue:      SCSI_NCR_CAN_QUEUE,     \
-                       this_id:        7,                      \
-                       sg_tablesize:   SCSI_NCR_SG_TABLESIZE,  \
-                       cmd_per_lun:    SCSI_NCR_CMD_PER_LUN,   \
-                       max_sectors:    MAX_HW_SEGMENTS*8,      \
-                       use_clustering: DISABLE_CLUSTERING,     \
-                       highmem_io:     1} 
+#define SYM53C8XX {     .name           = "",                  \
+                       .detect         = sym53c8xx_detect,     \
+                       .release        = sym53c8xx_release,    \
+                       .info           = sym53c8xx_info,       \
+                       .queuecommand   = sym53c8xx_queue_command,\
+                       .slave_configure = sym53c8xx_slave_configure,\
+                       .abort          = sym53c8xx_abort,      \
+                       .reset          = sym53c8xx_reset,      \
+                       .can_queue      = SCSI_NCR_CAN_QUEUE,   \
+                       .this_id        = 7,                    \
+                       .sg_tablesize   = SCSI_NCR_SG_TABLESIZE,        \
+                       .cmd_per_lun    = SCSI_NCR_CMD_PER_LUN, \
+                       .max_sectors    = MAX_HW_SEGMENTS*8,    \
+                       .use_clustering = DISABLE_CLUSTERING,   \
+                       .highmem_io     = 1} 
 
 #else
 
index dd0b0c01362b9d8511fb6282780c49f8e6fc181c..0fa7a1d656555ecac4919244ef59c9ce36fffc6e 100644 (file)
@@ -121,19 +121,19 @@ static int t128_proc_info (char *buffer, char **start, off_t offset,
  */
 
 #define TRANTOR_T128 {                                 \
-       name:           "Trantor T128/T128F/T228",      \
-       detect:         t128_detect,                    \
-       queuecommand:   t128_queue_command,             \
-       eh_abort_handler: t128_abort,                   \
-       eh_bus_reset_handler:    t128_bus_reset,        \
-       eh_host_reset_handler:   t128_host_reset,       \
-       eh_device_reset_handler: t128_device_reset,     \
-       bios_param:     t128_biosparam,                 \
-       can_queue:      CAN_QUEUE,                      \
-        this_id:        7,                             \
-       sg_tablesize:   SG_ALL,                         \
-       cmd_per_lun:    CMD_PER_LUN,                    \
-       use_clustering: DISABLE_CLUSTERING}
+       .name           = "Trantor T128/T128F/T228",    \
+       .detect         = t128_detect,                  \
+       .queuecommand   = t128_queue_command,           \
+       .eh_abort_handler = t128_abort,                 \
+       .eh_bus_reset_handler    = t128_bus_reset,      \
+       .eh_host_reset_handler   = t128_host_reset,     \
+       .eh_device_reset_handler = t128_device_reset,   \
+       .bios_param     = t128_biosparam,                       \
+       .can_queue      = CAN_QUEUE,                    \
+        .this_id        = 7,                           \
+       .sg_tablesize   = SG_ALL,                               \
+       .cmd_per_lun    = CMD_PER_LUN,                  \
+       .use_clustering = DISABLE_CLUSTERING}
 
 #ifndef HOSTS_C
 
index 948d372c115b7ec7f47ba1d8b00860aeadb897b1..d4fa66fab273ac1cfff22ae0d1d90bb23cc9ef9c 100644 (file)
@@ -13,17 +13,17 @@ static int u14_34f_slave_configure(Scsi_Device *);
 #define U14_34F_VERSION "8.00.00"
 
 #define ULTRASTOR_14_34F {                                                   \
-                name:         "UltraStor 14F/34F rev. " U14_34F_VERSION " ", \
-                detect:                  u14_34f_detect,                     \
-                release:                 u14_34f_release,                    \
-                queuecommand:            u14_34f_queuecommand,               \
-                eh_abort_handler:        u14_34f_eh_abort,                   \
-                eh_device_reset_handler: NULL,                               \
-                eh_bus_reset_handler:    NULL,                               \
-                eh_host_reset_handler:   u14_34f_eh_host_reset,              \
-                bios_param:              u14_34f_bios_param,                 \
-                slave_configure:         u14_34f_slave_configure,            \
-                this_id:                 7,                                  \
-                unchecked_isa_dma:       1,                                  \
-                use_clustering:          ENABLE_CLUSTERING                   \
+                .name         = "UltraStor 14F/34F rev. " U14_34F_VERSION " ", \
+                .detect                  = u14_34f_detect,                     \
+                .release                 = u14_34f_release,                    \
+                .queuecommand            = u14_34f_queuecommand,               \
+                .eh_abort_handler        = u14_34f_eh_abort,                   \
+                .eh_device_reset_handler = NULL,                               \
+                .eh_bus_reset_handler    = NULL,                               \
+                .eh_host_reset_handler   = u14_34f_eh_host_reset,              \
+                .bios_param              = u14_34f_bios_param,                 \
+                .slave_configure         = u14_34f_slave_configure,            \
+                .this_id                 = 7,                                  \
+                .unchecked_isa_dma       = 1,                                  \
+                .use_clustering          = ENABLE_CLUSTERING                   \
                 }
index 1d94e7ddc9fcd5e0b40cb501175165126a2734d6..3aba6ffead94300f4db388e99cf26d338011bbce 100644 (file)
@@ -30,19 +30,19 @@ static int ultrastor_biosparam(struct scsi_device *, struct block_device *, sect
 #define ULTRASTOR_24F_PORT 0xC80
 
 
-#define ULTRASTOR_14F {   name:              "UltraStor 14F/24F/34F",  \
-                         detect:            ultrastor_detect,          \
-                         info:              ultrastor_info,            \
-                         queuecommand:      ultrastor_queuecommand,    \
-                         eh_abort_handler:  ultrastor_abort,           \
-                         eh_host_reset_handler:  ultrastor_host_reset, \
-                         bios_param:        ultrastor_biosparam,       \
-                         can_queue:         ULTRASTOR_MAX_CMDS,        \
-                         this_id:           0,                         \
-                         sg_tablesize:      ULTRASTOR_14F_MAX_SG,      \
-                         cmd_per_lun:       ULTRASTOR_MAX_CMDS_PER_LUN,\
-                         unchecked_isa_dma: 1,                         \
-                         use_clustering:    ENABLE_CLUSTERING }
+#define ULTRASTOR_14F {   .name              = "UltraStor 14F/24F/34F",        \
+                         .detect            = ultrastor_detect,                \
+                         .info              = ultrastor_info,          \
+                         .queuecommand      = ultrastor_queuecommand,  \
+                         .eh_abort_handler  = ultrastor_abort,                 \
+                         .eh_host_reset_handler  = ultrastor_host_reset,       \
+                         .bios_param        = ultrastor_biosparam,     \
+                         .can_queue         = ULTRASTOR_MAX_CMDS,      \
+                         .this_id           = 0,                       \
+                         .sg_tablesize      = ULTRASTOR_14F_MAX_SG,    \
+                         .cmd_per_lun       = ULTRASTOR_MAX_CMDS_PER_LUN,\
+                         .unchecked_isa_dma = 1,                       \
+                         .use_clustering    = ENABLE_CLUSTERING }
 
 
 #ifdef ULTRASTOR_PRIVATE
index 0839ee7e3d5d581b082ecf4731cd518c236a3903..2af6a9f689a5b2a97231fc4723802a554e679424 100644 (file)
@@ -44,21 +44,21 @@ static int wd7000_biosparam(struct scsi_device *, struct block_device *,
 #define WD7000_SG   16
 
 #define WD7000 {                                               \
-       proc_name:              "wd7000",                       \
-       proc_info:              wd7000_proc_info,               \
-       name:                   "Western Digital WD-7000",      \
-       detect:                 wd7000_detect,                  \
-       command:                wd7000_command,                 \
-       queuecommand:           wd7000_queuecommand,            \
-       eh_bus_reset_handler:   wd7000_bus_reset,               \
-       eh_device_reset_handler:wd7000_device_reset,            \
-       eh_host_reset_handler:  wd7000_host_reset,              \
-       bios_param:             wd7000_biosparam,               \
-       can_queue:              WD7000_Q,                       \
-       this_id:                7,                              \
-       sg_tablesize:           WD7000_SG,                      \
-       cmd_per_lun:            1,                              \
-       unchecked_isa_dma:      1,                              \
-       use_clustering:         ENABLE_CLUSTERING,              \
+       .proc_name              = "wd7000",                     \
+       .proc_info              = wd7000_proc_info,             \
+       .name                   = "Western Digital WD-7000",    \
+       .detect                 = wd7000_detect,                        \
+       .command                = wd7000_command,                       \
+       .queuecommand           = wd7000_queuecommand,          \
+       .eh_bus_reset_handler   = wd7000_bus_reset,             \
+       .eh_device_reset_handler = wd7000_device_reset,         \
+       .eh_host_reset_handler  = wd7000_host_reset,            \
+       .bios_param             = wd7000_biosparam,             \
+       .can_queue              = WD7000_Q,                     \
+       .this_id                = 7,                            \
+       .sg_tablesize           = WD7000_SG,                    \
+       .cmd_per_lun            = 1,                            \
+       .unchecked_isa_dma      = 1,                            \
+       .use_clustering         = ENABLE_CLUSTERING,            \
 }
 #endif