Skip to content

L
linux
Commit 0b68fae1 authored by Art Haas's avatar Art Haas Committed by David S. Miller
Browse files
Options

[PATCH] C99 initializers for drivers/scsi

parent 7969d1df
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 121 deletions
drivers/scsi/NCR53c406a.c
View file @ 0b68fae1
...@@ -1070,23 +1070,23 @@ MODULE_LICENSE("GPL"); ...@@ -1070,23 +1070,23 @@ MODULE_LICENSE("GPL");
static Scsi_Host_Template driver_template = static Scsi_Host_Template driver_template =
{ {
proc_name: "NCR53c406a" /* proc_name */, .proc_name = "NCR53c406a" /* proc_name */,
name: "NCR53c406a" /* name */, .name = "NCR53c406a" /* name */,
detect: NCR53c406a_detect /* detect */, .detect = NCR53c406a_detect /* detect */,
info: NCR53c406a_info /* info */, .info = NCR53c406a_info /* info */,
command: NCR53c406a_command /* command */, .command = NCR53c406a_command /* command */,
queuecommand: NCR53c406a_queue /* queuecommand */, .queuecommand = NCR53c406a_queue /* queuecommand */,
eh_abort_handler: NCR53c406a_abort /* abort */, .eh_abort_handler = NCR53c406a_abort /* abort */,
eh_bus_reset_handler: NCR53c406a_bus_reset /* reset */, .eh_bus_reset_handler = NCR53c406a_bus_reset /* reset */,
eh_device_reset_handler: NCR53c406a_device_reset /* reset */, .eh_device_reset_handler = NCR53c406a_device_reset /* reset */,
eh_host_reset_handler: NCR53c406a_host_reset /* reset */, .eh_host_reset_handler = NCR53c406a_host_reset /* reset */,
bios_param: NCR53c406a_biosparm /* biosparm */, .bios_param = NCR53c406a_biosparm /* biosparm */,
can_queue: 1 /* can_queue */, .can_queue = 1 /* can_queue */,
this_id: 7 /* SCSI ID of the chip */, .this_id = 7 /* SCSI ID of the chip */,
sg_tablesize: 32 /*SG_ALL*/ /*SG_NONE*/, .sg_tablesize = 32 /*SG_ALL*/ /*SG_NONE*/,
cmd_per_lun: 1 /* commands per lun */, .cmd_per_lun = 1 /* commands per lun */,
unchecked_isa_dma: 1 /* unchecked_isa_dma */, .unchecked_isa_dma = 1 /* unchecked_isa_dma */,
use_clustering: ENABLE_CLUSTERING .use_clustering = ENABLE_CLUSTERING
}; };
#include "scsi_module.c" #include "scsi_module.c"
......
drivers/scsi/dpt_i2o.c
View file @ 0b68fae1
...@@ -112,9 +112,9 @@ static adpt_hba* hba_chain = NULL; ...@@ -112,9 +112,9 @@ static adpt_hba* hba_chain = NULL;
static int hba_count = 0; static int hba_count = 0;
static struct file_operations adpt_fops = { static struct file_operations adpt_fops = {
ioctl: adpt_ioctl, .ioctl = adpt_ioctl,
open: adpt_open, .open = adpt_open,
release: adpt_close .release = adpt_close
}; };
#ifdef REBOOT_NOTIFIER #ifdef REBOOT_NOTIFIER
......
drivers/scsi/ide-scsi.c
View file @ 0b68fae1
...@@ -859,20 +859,20 @@ static int idescsi_bios(struct scsi_device *sdev, struct block_device *bdev, ...@@ -859,20 +859,20 @@ static int idescsi_bios(struct scsi_device *sdev, struct block_device *bdev,
} }
static Scsi_Host_Template idescsi_template = { static Scsi_Host_Template idescsi_template = {
module: THIS_MODULE, .module = THIS_MODULE,
name: "idescsi", .name = "idescsi",
detect: idescsi_detect, .detect = idescsi_detect,
release: idescsi_release, .release = idescsi_release,
info: idescsi_info, .info = idescsi_info,
ioctl: idescsi_ioctl, .ioctl = idescsi_ioctl,
queuecommand: idescsi_queue, .queuecommand = idescsi_queue,
bios_param: idescsi_bios, .bios_param = idescsi_bios,
can_queue: 10, .can_queue = 10,
this_id: -1, .this_id = -1,
sg_tablesize: 256, .sg_tablesize = 256,
cmd_per_lun: 5, .cmd_per_lun = 5,
use_clustering: DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,
emulated: 1, .emulated = 1,
}; };
static int __init init_idescsi_module(void) static int __init init_idescsi_module(void)
......
drivers/scsi/imm.c
View file @ 0b68fae1
...@@ -47,17 +47,9 @@ typedef struct { ...@@ -47,17 +47,9 @@ typedef struct {
} imm_struct; } imm_struct;
#define IMM_EMPTY \ #define IMM_EMPTY \
{ dev: NULL, \ .base = -1, \
base: -1, \ .mode = IMM_AUTODETECT, \
base_hi: 0, \ .host = -1, \
mode: IMM_AUTODETECT, \
host: -1, \
cur_cmd: NULL, \
jstart: 0, \
failed: 0, \
dp: 0, \
rd: 0, \
p_busy: 0 \
} }
#include "imm.h" #include "imm.h"
......
drivers/scsi/ips.c
View file @ 0b68fae1
...@@ -317,24 +317,24 @@ IPS_DEFINE_COMPAT_TABLE( Compatable ); /* Version Compatability Ta ...@@ -317,24 +317,24 @@ IPS_DEFINE_COMPAT_TABLE( Compatable ); /* Version Compatability Ta
static void __devexit ips_remove_device(struct pci_dev *pci_dev); static void __devexit ips_remove_device(struct pci_dev *pci_dev);
struct pci_driver ips_pci_driver = { struct pci_driver ips_pci_driver = {
name: ips_hot_plug_name, .name = ips_hot_plug_name,
id_table: ips_pci_table, .id_table = ips_pci_table,
probe: ips_insert_device, .probe = ips_insert_device,
remove: __devexit_p(ips_remove_device), .remove = __devexit_p(ips_remove_device),
}; };
struct pci_driver ips_pci_driver_5i = { struct pci_driver ips_pci_driver_5i = {
name: ips_hot_plug_name, .name = ips_hot_plug_name,
id_table: ips_pci_table_5i, .id_table = ips_pci_table_5i,
probe: ips_insert_device, .probe = ips_insert_device,
remove: __devexit_p(ips_remove_device), .remove = __devexit_p(ips_remove_device),
}; };
struct pci_driver ips_pci_driver_i960 = { struct pci_driver ips_pci_driver_i960 = {
name: ips_hot_plug_name, .name = ips_hot_plug_name,
id_table: ips_pci_table_i960, .id_table = ips_pci_table_i960,
probe: ips_insert_device, .probe = ips_insert_device,
remove: __devexit_p(ips_remove_device), .remove = __devexit_p(ips_remove_device),
}; };
#endif #endif
......
drivers/scsi/nsp32.c
View file @ 0b68fae1
...@@ -2066,53 +2066,53 @@ static void __devexit nsp32_remove(struct pci_dev *pdev) ...@@ -2066,53 +2066,53 @@ static void __devexit nsp32_remove(struct pci_dev *pdev)
static struct pci_device_id nsp32_pci_table[] __devinitdata = { static struct pci_device_id nsp32_pci_table[] __devinitdata = {
{ {
vendor: PCI_VENDOR_ID_IODATA, .vendor = PCI_VENDOR_ID_IODATA,
device: PCI_DEVICE_ID_NINJASCSI_32BI_CBSC_II, .device = PCI_DEVICE_ID_NINJASCSI_32BI_CBSC_II,
subvendor: PCI_ANY_ID, .subvendor = PCI_ANY_ID,
subdevice: PCI_ANY_ID, .subdevice = PCI_ANY_ID,
driver_data: MODEL_IODATA, .driver_data = MODEL_IODATA,
}, },
{ {
vendor: PCI_VENDOR_ID_WORKBIT, .vendor = PCI_VENDOR_ID_WORKBIT,
device: PCI_DEVICE_ID_NINJASCSI_32BI_KME, .device = PCI_DEVICE_ID_NINJASCSI_32BI_KME,
subvendor: PCI_ANY_ID, .subvendor = PCI_ANY_ID,
subdevice: PCI_ANY_ID, .subdevice = PCI_ANY_ID,
driver_data: MODEL_KME, .driver_data = MODEL_KME,
}, },
{ {
vendor: PCI_VENDOR_ID_WORKBIT, .vendor = PCI_VENDOR_ID_WORKBIT,
device: PCI_DEVICE_ID_NINJASCSI_32BI_WBT, .device = PCI_DEVICE_ID_NINJASCSI_32BI_WBT,
subvendor: PCI_ANY_ID, .subvendor = PCI_ANY_ID,
subdevice: PCI_ANY_ID, .subdevice = PCI_ANY_ID,
driver_data: MODEL_WORKBIT, .driver_data = MODEL_WORKBIT,
}, },
{ {
vendor: PCI_VENDOR_ID_WORKBIT, .vendor = PCI_VENDOR_ID_WORKBIT,
device: PCI_DEVICE_ID_WORKBIT_STANDARD, .device = PCI_DEVICE_ID_WORKBIT_STANDARD,
subvendor: PCI_ANY_ID, .subvendor = PCI_ANY_ID,
subdevice: PCI_ANY_ID, .subdevice = PCI_ANY_ID,
driver_data: MODEL_PCI_WORKBIT, .driver_data = MODEL_PCI_WORKBIT,
}, },
{ {
vendor: PCI_VENDOR_ID_WORKBIT, .vendor = PCI_VENDOR_ID_WORKBIT,
device: PCI_DEVICE_ID_NINJASCSI_32BI_LOGITEC, .device = PCI_DEVICE_ID_NINJASCSI_32BI_LOGITEC,
subvendor: PCI_ANY_ID, .subvendor = PCI_ANY_ID,
subdevice: PCI_ANY_ID, .subdevice = PCI_ANY_ID,
driver_data: MODEL_EXT_ROM, .driver_data = MODEL_EXT_ROM,
}, },
{ {
vendor: PCI_VENDOR_ID_WORKBIT, .vendor = PCI_VENDOR_ID_WORKBIT,
device: PCI_DEVICE_ID_NINJASCSI_32BIB_LOGITEC, .device = PCI_DEVICE_ID_NINJASCSI_32BIB_LOGITEC,
subvendor: PCI_ANY_ID, .subvendor = PCI_ANY_ID,
subdevice: PCI_ANY_ID, .subdevice = PCI_ANY_ID,
driver_data: MODEL_PCI_LOGITEC, .driver_data = MODEL_PCI_LOGITEC,
}, },
{ {
vendor: PCI_VENDOR_ID_WORKBIT, .vendor = PCI_VENDOR_ID_WORKBIT,
device: PCI_DEVICE_ID_NINJASCSI_32UDE_MELCO, .device = PCI_DEVICE_ID_NINJASCSI_32UDE_MELCO,
subvendor: PCI_ANY_ID, .subvendor = PCI_ANY_ID,
subdevice: PCI_ANY_ID, .subdevice = PCI_ANY_ID,
driver_data: MODEL_PCI_MELCO, .driver_data = MODEL_PCI_MELCO,
}, },
{0,0,}, {0,0,},
}; };
......
drivers/scsi/osst.c
View file @ 0b68fae1
...@@ -160,13 +160,13 @@ static int osst_dev_max; ...@@ -160,13 +160,13 @@ static int osst_dev_max;
struct Scsi_Device_Template osst_template = struct Scsi_Device_Template osst_template =
{ {
module: THIS_MODULE, .module = THIS_MODULE,
list: LIST_HEAD_INIT(osst_template.list), .list = LIST_HEAD_INIT(osst_template.list),
name: "OnStream tape", .name = "OnStream tape",
tag: "osst", .tag = "osst",
scsi_type: TYPE_TAPE, .scsi_type = TYPE_TAPE,
attach: osst_attach, .attach = osst_attach,
detach: osst_detach .detach = osst_detach
}; };
static int osst_int_ioctl(OS_Scsi_Tape *STp, Scsi_Request ** aSRpnt, unsigned int cmd_in,unsigned long arg); static int osst_int_ioctl(OS_Scsi_Tape *STp, Scsi_Request ** aSRpnt, unsigned int cmd_in,unsigned long arg);
...@@ -5354,12 +5354,12 @@ __setup("osst=", osst_setup); ...@@ -5354,12 +5354,12 @@ __setup("osst=", osst_setup);
static struct file_operations osst_fops = { static struct file_operations osst_fops = {
read: osst_read, .read = osst_read,
write: osst_write, .write = osst_write,
ioctl: osst_ioctl, .ioctl = osst_ioctl,
open: os_scsi_tape_open, .open = os_scsi_tape_open,
flush: os_scsi_tape_flush, .flush = os_scsi_tape_flush,
release: os_scsi_tape_close, .release = os_scsi_tape_close,
}; };
static int osst_supports(Scsi_Device * SDp) static int osst_supports(Scsi_Device * SDp)
......
drivers/scsi/ppa.c
View file @ 0b68fae1
...@@ -38,16 +38,11 @@ typedef struct { ...@@ -38,16 +38,11 @@ typedef struct {
} ppa_struct; } ppa_struct;
#define PPA_EMPTY \ #define PPA_EMPTY \
{ dev: NULL, \ .base = -1, \
base: -1, \ .mode = PPA_AUTODETECT, \
mode: PPA_AUTODETECT, \ .host = -1, \
host: -1, \ .ppa_tq = { .func = ppa_interrupt }, \
cur_cmd: NULL, \ .recon_tmo = PPA_RECON_TMO, \
ppa_tq: { func: ppa_interrupt }, \
jstart: 0, \
recon_tmo: PPA_RECON_TMO, \
failed: 0, \
p_busy: 0 \
} }
#include "ppa.h" #include "ppa.h"
......
drivers/scsi/scsi.c
View file @ 0b68fae1
...@@ -2199,8 +2199,8 @@ static int scsi_bus_match(struct device *scsi_driverfs_dev, ...@@ -2199,8 +2199,8 @@ static int scsi_bus_match(struct device *scsi_driverfs_dev,
} }
struct bus_type scsi_driverfs_bus_type = { struct bus_type scsi_driverfs_bus_type = {
name: "scsi", .name = "scsi",
match: scsi_bus_match, .match = scsi_bus_match,
}; };
static int __init init_scsi(void) static int __init init_scsi(void)
......
drivers/scsi/tmscsim.c
View file @ 0b68fae1
...@@ -276,10 +276,10 @@ ...@@ -276,10 +276,10 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,99) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,99)
static struct pci_device_id tmscsim_pci_tbl[] __initdata = { static struct pci_device_id tmscsim_pci_tbl[] __initdata = {
{ {
vendor: PCI_VENDOR_ID_AMD, .vendor = PCI_VENDOR_ID_AMD,
device: PCI_DEVICE_ID_AMD53C974, .device = PCI_DEVICE_ID_AMD53C974,
subvendor: PCI_ANY_ID, .subvendor = PCI_ANY_ID,
subdevice: PCI_ANY_ID, .subdevice = PCI_ANY_ID,
}, },
{ } /* Terminating entry */ { } /* Terminating entry */
}; };
......
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