Hi.
Here's the second patch for drivers/ide/pci that switch the header files
(and two lines in serverworks.c) to use C99 designated initializers. The
patches are against 2.5.47.
This mail holds patches for files starting with the letters [o-z].
Art Haas
--- linux-2.5.47/drivers/ide/pci/opti621.h.old 2002-10-07 15:45:28.000000000 -0500
+++ linux-2.5.47/drivers/ide/pci/opti621.h 2002-11-11 07:22:07.000000000 -0600
@@ -11,38 +11,38 @@
static ide_pci_device_t opti621_chipsets[] __devinitdata = {
{ /* 0 */
- vendor: PCI_VENDOR_ID_OPTI,
- device: PCI_DEVICE_ID_OPTI_82C621,
- name: "OPTI621",
- init_setup: init_setup_opti621,
- init_chipset: NULL,
- init_iops: NULL,
- init_hwif: init_hwif_opti621,
- init_dma: init_dma_opti621,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_OPTI,
+ .device = PCI_DEVICE_ID_OPTI_82C621,
+ .name = "OPTI621",
+ .init_setup = init_setup_opti621,
+ .init_chipset = NULL,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_opti621,
+ .init_dma = init_dma_opti621,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 1 */
- vendor: PCI_VENDOR_ID_OPTI,
- device: PCI_DEVICE_ID_OPTI_82C825,
- name: "OPTI621X",
- init_setup: init_setup_opti621,
- init_chipset: NULL,
- init_iops: NULL,
- init_hwif: init_hwif_opti621,
- init_dma: init_dma_opti621,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_OPTI,
+ .device = PCI_DEVICE_ID_OPTI_82C825,
+ .name = "OPTI621X",
+ .init_setup = init_setup_opti621,
+ .init_chipset = NULL,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_opti621,
+ .init_dma = init_dma_opti621,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{
- vendor: 0,
- device: 0,
- channels: 0,
- bootable: EOL,
+ .vendor = 0,
+ .device = 0,
+ .channels = 0,
+ .bootable = EOL,
}
};
--- linux-2.5.47/drivers/ide/pci/pdc202xx_new.h.old 2002-10-07 15:45:28.000000000 -0500
+++ linux-2.5.47/drivers/ide/pci/pdc202xx_new.h 2002-11-11 07:22:07.000000000 -0600
@@ -209,10 +209,10 @@
static ide_pci_host_proc_t pdcnew_procs[] __initdata = {
{
- name: "pdcnew",
- set: 1,
- get_info: pdcnew_get_info,
- parent: NULL,
+ .name = "pdcnew",
+ .set = 1,
+ .get_info = pdcnew_get_info,
+ .parent = NULL,
},
};
#endif /* DISPLAY_PDC202XX_TIMINGS && CONFIG_PROC_FS */
@@ -227,116 +227,116 @@
static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
{ /* 0 */
- vendor: PCI_VENDOR_ID_PROMISE,
- device: PCI_DEVICE_ID_PROMISE_20268,
- name: "PDC20268",
- init_setup: init_setup_pdcnew,
- init_chipset: init_chipset_pdcnew,
- init_iops: NULL,
- init_hwif: init_hwif_pdc202new,
- init_dma: init_dma_pdc202new,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: OFF_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_PROMISE,
+ .device = PCI_DEVICE_ID_PROMISE_20268,
+ .name = "PDC20268",
+ .init_setup = init_setup_pdcnew,
+ .init_chipset = init_chipset_pdcnew,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_pdc202new,
+ .init_dma = init_dma_pdc202new,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = OFF_BOARD,
+ .extra = 0,
},{ /* 1 */
- vendor: PCI_VENDOR_ID_PROMISE,
- device: PCI_DEVICE_ID_PROMISE_20269,
- name: "PDC20269",
- init_setup: init_setup_pdcnew,
- init_chipset: init_chipset_pdcnew,
- init_iops: NULL,
- init_hwif: init_hwif_pdc202new,
- init_dma: init_dma_pdc202new,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: OFF_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_PROMISE,
+ .device = PCI_DEVICE_ID_PROMISE_20269,
+ .name = "PDC20269",
+ .init_setup = init_setup_pdcnew,
+ .init_chipset = init_chipset_pdcnew,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_pdc202new,
+ .init_dma = init_dma_pdc202new,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = OFF_BOARD,
+ .extra = 0,
},{ /* 2 */
- vendor: PCI_VENDOR_ID_PROMISE,
- device: PCI_DEVICE_ID_PROMISE_20270,
- name: "PDC20270",
- init_setup: init_setup_pdc20270,
- init_chipset: init_chipset_pdcnew,
- init_iops: NULL,
- init_hwif: init_hwif_pdc202new,
- init_dma: init_dma_pdc202new,
- channels: 2,
- autodma: AUTODMA,
+ .vendor = PCI_VENDOR_ID_PROMISE,
+ .device = PCI_DEVICE_ID_PROMISE_20270,
+ .name = "PDC20270",
+ .init_setup = init_setup_pdc20270,
+ .init_chipset = init_chipset_pdcnew,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_pdc202new,
+ .init_dma = init_dma_pdc202new,
+ .channels = 2,
+ .autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
#else /* !CONFIG_PDC202XX_FORCE */
- enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
- bootable: OFF_BOARD,
- extra: 0,
+ .bootable = OFF_BOARD,
+ .extra = 0,
},{ /* 3 */
- vendor: PCI_VENDOR_ID_PROMISE,
- device: PCI_DEVICE_ID_PROMISE_20271,
- name: "PDC20271",
- init_setup: init_setup_pdcnew,
- init_chipset: init_chipset_pdcnew,
- init_iops: NULL,
- init_hwif: init_hwif_pdc202new,
- init_dma: init_dma_pdc202new,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: OFF_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_PROMISE,
+ .device = PCI_DEVICE_ID_PROMISE_20271,
+ .name = "PDC20271",
+ .init_setup = init_setup_pdcnew,
+ .init_chipset = init_chipset_pdcnew,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_pdc202new,
+ .init_dma = init_dma_pdc202new,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = OFF_BOARD,
+ .extra = 0,
},{ /* 4 */
- vendor: PCI_VENDOR_ID_PROMISE,
- device: PCI_DEVICE_ID_PROMISE_20275,
- name: "PDC20275",
- init_setup: init_setup_pdcnew,
- init_chipset: init_chipset_pdcnew,
- init_iops: NULL,
- init_hwif: init_hwif_pdc202new,
- init_dma: init_dma_pdc202new,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: OFF_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_PROMISE,
+ .device = PCI_DEVICE_ID_PROMISE_20275,
+ .name = "PDC20275",
+ .init_setup = init_setup_pdcnew,
+ .init_chipset = init_chipset_pdcnew,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_pdc202new,
+ .init_dma = init_dma_pdc202new,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = OFF_BOARD,
+ .extra = 0,
},{ /* 5 */
- vendor: PCI_VENDOR_ID_PROMISE,
- device: PCI_DEVICE_ID_PROMISE_20276,
- name: "PDC20276",
- init_setup: init_setup_pdc20276,
- init_chipset: init_chipset_pdcnew,
- init_iops: NULL,
- init_hwif: init_hwif_pdc202new,
- init_dma: init_dma_pdc202new,
- channels: 2,
- autodma: AUTODMA,
+ .vendor = PCI_VENDOR_ID_PROMISE,
+ .device = PCI_DEVICE_ID_PROMISE_20276,
+ .name = "PDC20276",
+ .init_setup = init_setup_pdc20276,
+ .init_chipset = init_chipset_pdcnew,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_pdc202new,
+ .init_dma = init_dma_pdc202new,
+ .channels = 2,
+ .autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
#else /* !CONFIG_PDC202XX_FORCE */
- enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
- bootable: OFF_BOARD,
- extra: 0,
+ .bootable = OFF_BOARD,
+ .extra = 0,
},{ /* 6 */
- vendor: PCI_VENDOR_ID_PROMISE,
- device: PCI_DEVICE_ID_PROMISE_20277,
- name: "PDC20277",
- init_setup: init_setup_pdcnew,
- init_chipset: init_chipset_pdcnew,
- init_iops: NULL,
- init_hwif: init_hwif_pdc202new,
- init_dma: init_dma_pdc202new,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: OFF_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_PROMISE,
+ .device = PCI_DEVICE_ID_PROMISE_20277,
+ .name = "PDC20277",
+ .init_setup = init_setup_pdcnew,
+ .init_chipset = init_chipset_pdcnew,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_pdc202new,
+ .init_dma = init_dma_pdc202new,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = OFF_BOARD,
+ .extra = 0,
},{
- vendor: 0,
- device: 0,
- channels: 0,
- bootable: EOL,
+ .vendor = 0,
+ .device = 0,
+ .channels = 0,
+ .bootable = EOL,
}
};
--- linux-2.5.47/drivers/ide/pci/pdc202xx_old.h.old 2002-10-07 15:45:28.000000000 -0500
+++ linux-2.5.47/drivers/ide/pci/pdc202xx_old.h 2002-11-11 07:22:07.000000000 -0600
@@ -209,10 +209,10 @@
static ide_pci_host_proc_t pdc202xx_procs[] __initdata = {
{
- name: "pdc202xx",
- set: 1,
- get_info: pdc202xx_get_info,
- parent: NULL,
+ .name = "pdc202xx",
+ .set = 1,
+ .get_info = pdc202xx_get_info,
+ .parent = NULL,
},
};
#endif /* DISPLAY_PDC202XX_TIMINGS && CONFIG_PROC_FS */
@@ -227,99 +227,99 @@
static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
{ /* 0 */
- vendor: PCI_VENDOR_ID_PROMISE,
- device: PCI_DEVICE_ID_PROMISE_20246,
- name: "PDC20246",
- init_setup: init_setup_pdc202ata4,
- init_chipset: init_chipset_pdc202xx,
- init_iops: NULL,
- init_hwif: init_hwif_pdc202xx,
- init_dma: init_dma_pdc202xx,
- channels: 2,
- autodma: AUTODMA,
+ .vendor = PCI_VENDOR_ID_PROMISE,
+ .device = PCI_DEVICE_ID_PROMISE_20246,
+ .name = "PDC20246",
+ .init_setup = init_setup_pdc202ata4,
+ .init_chipset = init_chipset_pdc202xx,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_pdc202xx,
+ .init_dma = init_dma_pdc202xx,
+ .channels = 2,
+ .autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
#else /* !CONFIG_PDC202XX_FORCE */
- enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
- bootable: OFF_BOARD,
- extra: 16,
+ .bootable = OFF_BOARD,
+ .extra = 16,
},{ /* 1 */
- vendor: PCI_VENDOR_ID_PROMISE,
- device: PCI_DEVICE_ID_PROMISE_20262,
- name: "PDC20262",
- init_setup: init_setup_pdc202ata4,
- init_chipset: init_chipset_pdc202xx,
- init_iops: NULL,
- init_hwif: init_hwif_pdc202xx,
- init_dma: init_dma_pdc202xx,
- channels: 2,
- autodma: AUTODMA,
+ .vendor = PCI_VENDOR_ID_PROMISE,
+ .device = PCI_DEVICE_ID_PROMISE_20262,
+ .name = "PDC20262",
+ .init_setup = init_setup_pdc202ata4,
+ .init_chipset = init_chipset_pdc202xx,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_pdc202xx,
+ .init_dma = init_dma_pdc202xx,
+ .channels = 2,
+ .autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
#else /* !CONFIG_PDC202XX_FORCE */
- enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
- bootable: OFF_BOARD,
- extra: 48,
+ .bootable = OFF_BOARD,
+ .extra = 48,
},{ /* 2 */
- vendor: PCI_VENDOR_ID_PROMISE,
- device: PCI_DEVICE_ID_PROMISE_20263,
- name: "PDC20263",
- init_setup: init_setup_pdc202ata4,
- init_chipset: init_chipset_pdc202xx,
- init_iops: NULL,
- init_hwif: init_hwif_pdc202xx,
- init_dma: init_dma_pdc202xx,
- channels: 2,
- autodma: AUTODMA,
+ .vendor = PCI_VENDOR_ID_PROMISE,
+ .device = PCI_DEVICE_ID_PROMISE_20263,
+ .name = "PDC20263",
+ .init_setup = init_setup_pdc202ata4,
+ .init_chipset = init_chipset_pdc202xx,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_pdc202xx,
+ .init_dma = init_dma_pdc202xx,
+ .channels = 2,
+ .autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
#else /* !CONFIG_PDC202XX_FORCE */
- enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
- bootable: OFF_BOARD,
- extra: 48,
+ .bootable = OFF_BOARD,
+ .extra = 48,
},{ /* 3 */
- vendor: PCI_VENDOR_ID_PROMISE,
- device: PCI_DEVICE_ID_PROMISE_20265,
- name: "PDC20265",
- init_setup: init_setup_pdc20265,
- init_chipset: init_chipset_pdc202xx,
- init_hwif: init_hwif_pdc202xx,
- init_dma: init_dma_pdc202xx,
- channels: 2,
- autodma: AUTODMA,
+ .vendor = PCI_VENDOR_ID_PROMISE,
+ .device = PCI_DEVICE_ID_PROMISE_20265,
+ .name = "PDC20265",
+ .init_setup = init_setup_pdc20265,
+ .init_chipset = init_chipset_pdc202xx,
+ .init_hwif = init_hwif_pdc202xx,
+ .init_dma = init_dma_pdc202xx,
+ .channels = 2,
+ .autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
#else /* !CONFIG_PDC202XX_FORCE */
- enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
- bootable: OFF_BOARD,
- extra: 48,
+ .bootable = OFF_BOARD,
+ .extra = 48,
},{ /* 4 */
- vendor: PCI_VENDOR_ID_PROMISE,
- device: PCI_DEVICE_ID_PROMISE_20267,
- name: "PDC20267",
- init_setup: init_setup_pdc202xx,
- init_chipset: init_chipset_pdc202xx,
- init_iops: NULL,
- init_hwif: init_hwif_pdc202xx,
- init_dma: init_dma_pdc202xx,
- channels: 2,
- autodma: AUTODMA,
+ .vendor = PCI_VENDOR_ID_PROMISE,
+ .device = PCI_DEVICE_ID_PROMISE_20267,
+ .name = "PDC20267",
+ .init_setup = init_setup_pdc202xx,
+ .init_chipset = init_chipset_pdc202xx,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_pdc202xx,
+ .init_dma = init_dma_pdc202xx,
+ .channels = 2,
+ .autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
#else /* !CONFIG_PDC202XX_FORCE */
- enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
- bootable: OFF_BOARD,
- extra: 48,
+ .bootable = OFF_BOARD,
+ .extra = 48,
},{
- vendor: 0,
- device: 0,
- channels: 0,
- bootable: EOL,
+ .vendor = 0,
+ .device = 0,
+ .channels = 0,
+ .bootable = EOL,
}
};
--- linux-2.5.47/drivers/ide/pci/pdcadma.h.old 2002-10-07 15:45:28.000000000 -0500
+++ linux-2.5.47/drivers/ide/pci/pdcadma.h 2002-11-11 07:22:07.000000000 -0600
@@ -17,10 +17,10 @@
static ide_pci_host_proc_t pdcadma_procs[] __initdata = {
{
- name: "pdcadma",
- set: 1,
- get_info: pdcadma_get_info,
- parent: NULL,
+ .name = "pdcadma",
+ .set = 1,
+ .get_info = pdcadma_get_info,
+ .parent = NULL,
},
};
#endif /* defined(DISPLAY_PDCADMA_TIMINGS) && defined(CONFIG_PROC_FS) */
@@ -32,24 +32,24 @@
static ide_pci_device_t pdcadma_chipsets[] __devinitdata = {
{ /* 0 */
- vendor: PCI_VENDOR_ID_PDC,
- device: PCI_DEVICE_ID_PDC_1841,
- name: "PDCADMA",
- init_setup: init_setup_pdcadma,
- init_chipset: init_chipset_pdcadma,
- init_iops: NULL,
- init_hwif: init_hwif_pdcadma,
- init_dma: init_dma_pdcadma,
- channels: 2,
- autodma: NODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: OFF_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_PDC,
+ .device = PCI_DEVICE_ID_PDC_1841,
+ .name = "PDCADMA",
+ .init_setup = init_setup_pdcadma,
+ .init_chipset = init_chipset_pdcadma,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_pdcadma,
+ .init_dma = init_dma_pdcadma,
+ .channels = 2,
+ .autodma = NODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = OFF_BOARD,
+ .extra = 0,
},{
- vendor: 0,
- device: 0,
- channels: 0,
- bootable: EOL,
+ .vendor = 0,
+ .device = 0,
+ .channels = 0,
+ .bootable = EOL,
}
};
--- linux-2.5.47/drivers/ide/pci/piix.h.old 2002-10-07 15:45:28.000000000 -0500
+++ linux-2.5.47/drivers/ide/pci/piix.h 2002-11-11 07:22:07.000000000 -0600
@@ -19,10 +19,10 @@
static ide_pci_host_proc_t piix_procs[] __devinitdata = {
{
- name: "piix",
- set: 1,
- get_info: piix_get_info,
- parent: NULL,
+ .name = "piix",
+ .set = 1,
+ .get_info = piix_get_info,
+ .parent = NULL,
},
};
#endif /* defined(DISPLAY_PIIX_TIMINGS) && defined(CONFIG_PROC_FS) */
@@ -40,235 +40,235 @@
static ide_pci_device_t piix_pci_info[] __devinitdata = {
{ /* 0 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82371FB_0,
- name: "PIIXa",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82371FB_0,
+ .name = "PIIXa",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 1 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82371FB_1,
- name: "PIIXb",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82371FB_1,
+ .name = "PIIXb",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 2 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82371MX,
- name: "MPIIX",
- init_setup: init_setup_piix,
- init_chipset: NULL,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: NULL,
- channels: 2,
- autodma: NODMA,
- enablebits: {{0x6D,0x80,0x80}, {0x6F,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82371MX,
+ .name = "MPIIX",
+ .init_setup = init_setup_piix,
+ .init_chipset = NULL,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = NULL,
+ .channels = 2,
+ .autodma = NODMA,
+ .enablebits = {{0x6D,0x80,0x80}, {0x6F,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 3 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82371SB_1,
- name: "PIIX3",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82371SB_1,
+ .name = "PIIX3",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 4 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82371AB,
- name: "PIIX4",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82371AB,
+ .name = "PIIX4",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 5 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82801AB_1,
- name: "ICH0",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82801AB_1,
+ .name = "ICH0",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 6 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82443MX_1,
- name: "PIIX4",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82443MX_1,
+ .name = "PIIX4",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 7 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82801AA_1,
- name: "ICH",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82801AA_1,
+ .name = "ICH",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 8 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82372FB_1,
- name: "PIIX4",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82372FB_1,
+ .name = "PIIX4",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 9 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82451NX,
- name: "PIIX4",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: NOAUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82451NX,
+ .name = "PIIX4",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = NOAUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 10 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82801BA_9,
- name: "ICH2",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82801BA_9,
+ .name = "ICH2",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 11 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82801BA_8,
- name: "ICH2M",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82801BA_8,
+ .name = "ICH2M",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 12 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82801CA_10,
- name: "ICH3M",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82801CA_10,
+ .name = "ICH3M",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 13 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82801CA_11,
- name: "ICH3",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82801CA_11,
+ .name = "ICH3",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 14 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82801DB_11,
- name: "ICH4",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82801DB_11,
+ .name = "ICH4",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 15 */
- vendor: PCI_VENDOR_ID_INTEL,
- device: PCI_DEVICE_ID_INTEL_82801E_11,
- name: "C-ICH",
- init_setup: init_setup_piix,
- init_chipset: init_chipset_piix,
- init_iops: NULL,
- init_hwif: init_hwif_piix,
- init_dma: init_dma_piix,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .device = PCI_DEVICE_ID_INTEL_82801E_11,
+ .name = "C-ICH",
+ .init_setup = init_setup_piix,
+ .init_chipset = init_chipset_piix,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_piix,
+ .init_dma = init_dma_piix,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{
- vendor: 0,
- device: 0,
- channels: 0,
- init_setup: NULL,
- bootable: EOL,
+ .vendor = 0,
+ .device = 0,
+ .channels = 0,
+ .init_setup = NULL,
+ .bootable = EOL,
}
};
--- linux-2.5.47/drivers/ide/pci/rz1000.h.old 2002-10-07 15:45:28.000000000 -0500
+++ linux-2.5.47/drivers/ide/pci/rz1000.h 2002-11-11 07:22:07.000000000 -0600
@@ -9,36 +9,36 @@
static ide_pci_device_t rz1000_chipsets[] __devinitdata = {
{
- vendor: PCI_VENDOR_ID_PCTECH,
- device: PCI_DEVICE_ID_PCTECH_RZ1000,
- name: "RZ1000",
- init_chipset: NULL,
- init_iops: NULL,
- init_hwif: init_hwif_rz1000,
- init_dma: NULL,
- channels: 2,
- autodma: NODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_PCTECH,
+ .device = PCI_DEVICE_ID_PCTECH_RZ1000,
+ .name = "RZ1000",
+ .init_chipset = NULL,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_rz1000,
+ .init_dma = NULL,
+ .channels = 2,
+ .autodma = NODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{
- vendor: PCI_VENDOR_ID_PCTECH,
- device: PCI_DEVICE_ID_PCTECH_RZ1001,
- name: "RZ1001",
- init_chipset: NULL,
- init_iops: NULL,
- init_hwif: init_hwif_rz1000,
- init_dma: NULL,
- channels: 2,
- autodma: NODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_PCTECH,
+ .device = PCI_DEVICE_ID_PCTECH_RZ1001,
+ .name = "RZ1001",
+ .init_chipset = NULL,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_rz1000,
+ .init_dma = NULL,
+ .channels = 2,
+ .autodma = NODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{
- vendor: 0,
- device: 0,
- channels: 0,
- bootable: EOL,
+ .vendor = 0,
+ .device = 0,
+ .channels = 0,
+ .bootable = EOL,
}
};
--- linux-2.5.47/drivers/ide/pci/serverworks.c.old 2002-10-12 09:46:46.000000000 -0500
+++ linux-2.5.47/drivers/ide/pci/serverworks.c 2002-11-11 07:18:45.000000000 -0600
@@ -801,8 +801,8 @@
.id_table = svwks_pci_tbl,
.probe = svwks_init_one,
#if 0 /* FIXME: implement */
- suspend: ,
- resume: ,
+ .suspend = ,
+ .resume = ,
#endif
};
--- linux-2.5.47/drivers/ide/pci/serverworks.h.old 2002-10-07 15:45:28.000000000 -0500
+++ linux-2.5.47/drivers/ide/pci/serverworks.h 2002-11-11 07:22:07.000000000 -0600
@@ -23,10 +23,10 @@
static ide_pci_host_proc_t svwks_procs[] __initdata = {
{
- name: "svwks",
- set: 1,
- get_info: svwks_get_info,
- parent: NULL,
+ .name = "svwks",
+ .set = 1,
+ .get_info = svwks_get_info,
+ .parent = NULL,
},
};
#endif /* defined(DISPLAY_SVWKS_TIMINGS) && defined(CONFIG_PROC_FS) */
@@ -39,66 +39,66 @@
static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
{ /* 0 */
- vendor: PCI_VENDOR_ID_SERVERWORKS,
- device: PCI_DEVICE_ID_SERVERWORKS_OSB4IDE,
- name: "SvrWks OSB4",
- init_setup: init_setup_svwks,
- init_chipset: init_chipset_svwks,
- init_iops: NULL,
- init_hwif: init_hwif_svwks,
- init_dma: NULL,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_SERVERWORKS,
+ .device = PCI_DEVICE_ID_SERVERWORKS_OSB4IDE,
+ .name = "SvrWks OSB4",
+ .init_setup = init_setup_svwks,
+ .init_chipset = init_chipset_svwks,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_svwks,
+ .init_dma = NULL,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 1 */
- vendor: PCI_VENDOR_ID_SERVERWORKS,
- device: PCI_DEVICE_ID_SERVERWORKS_CSB5IDE,
- name: "SvrWks CSB5",
- init_setup: init_setup_svwks,
- init_chipset: init_chipset_svwks,
- init_iops: NULL,
- init_hwif: init_hwif_svwks,
- init_dma: init_dma_svwks,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_SERVERWORKS,
+ .device = PCI_DEVICE_ID_SERVERWORKS_CSB5IDE,
+ .name = "SvrWks CSB5",
+ .init_setup = init_setup_svwks,
+ .init_chipset = init_chipset_svwks,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_svwks,
+ .init_dma = init_dma_svwks,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 2 */
- vendor: PCI_VENDOR_ID_SERVERWORKS,
- device: PCI_DEVICE_ID_SERVERWORKS_CSB6IDE,
- name: "SvrWks CSB6",
- init_setup: init_setup_csb6,
- init_chipset: init_chipset_svwks,
- init_iops: NULL,
- init_hwif: init_hwif_svwks,
- init_dma: init_dma_svwks,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_SERVERWORKS,
+ .device = PCI_DEVICE_ID_SERVERWORKS_CSB6IDE,
+ .name = "SvrWks CSB6",
+ .init_setup = init_setup_csb6,
+ .init_chipset = init_chipset_svwks,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_svwks,
+ .init_dma = init_dma_svwks,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 3 */
- vendor: PCI_VENDOR_ID_SERVERWORKS,
- device: PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2,
- name: "SvrWks CSB6",
- init_setup: init_setup_csb6,
- init_chipset: init_chipset_svwks,
- init_iops: NULL,
- init_hwif: init_hwif_svwks,
- init_dma: init_dma_svwks,
- channels: 1, /* 2 */
- autodma: AUTODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_SERVERWORKS,
+ .device = PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2,
+ .name = "SvrWks CSB6",
+ .init_setup = init_setup_csb6,
+ .init_chipset = init_chipset_svwks,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_svwks,
+ .init_dma = init_dma_svwks,
+ .channels = 1, /* 2 */
+ .autodma = AUTODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{
- vendor: 0,
- device: 0,
- channels: 0,
- bootable: EOL,
+ .vendor = 0,
+ .device = 0,
+ .channels = 0,
+ .bootable = EOL,
}
};
--- linux-2.5.47/drivers/ide/pci/siimage.h.old 2002-10-07 15:45:28.000000000 -0500
+++ linux-2.5.47/drivers/ide/pci/siimage.h 2002-11-11 07:22:07.000000000 -0600
@@ -99,10 +99,10 @@
static ide_pci_host_proc_t siimage_procs[] __initdata = {
{
- name: "siimage",
- set: 1,
- get_info: siimage_get_info,
- parent: NULL,
+ .name = "siimage",
+ .set = 1,
+ .get_info = siimage_get_info,
+ .parent = NULL,
},
};
#endif /* DISPLAY_SIIMAGE_TIMINGS && CONFIG_PROC_FS */
@@ -114,36 +114,36 @@
static ide_pci_device_t siimage_chipsets[] __devinitdata = {
{ /* 0 */
- vendor: PCI_VENDOR_ID_CMD,
- device: PCI_DEVICE_ID_SII_680,
- name: "SiI680",
- init_chipset: init_chipset_siimage,
- init_iops: init_iops_siimage,
- init_hwif: init_hwif_siimage,
- init_dma: init_dma_siimage,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_CMD,
+ .device = PCI_DEVICE_ID_SII_680,
+ .name = "SiI680",
+ .init_chipset = init_chipset_siimage,
+ .init_iops = init_iops_siimage,
+ .init_hwif = init_hwif_siimage,
+ .init_dma = init_dma_siimage,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 1 */
- vendor: PCI_VENDOR_ID_CMD,
- device: PCI_DEVICE_ID_SII_3112,
- name: "SiI3112 Serial ATA",
- init_chipset: init_chipset_siimage,
- init_iops: init_iops_siimage,
- init_hwif: init_hwif_siimage,
- init_dma: init_dma_siimage,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_CMD,
+ .device = PCI_DEVICE_ID_SII_3112,
+ .name = "SiI3112 Serial ATA",
+ .init_chipset = init_chipset_siimage,
+ .init_iops = init_iops_siimage,
+ .init_hwif = init_hwif_siimage,
+ .init_dma = init_dma_siimage,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{
- vendor: 0,
- device: 0,
- channels: 0,
- bootable: EOL,
+ .vendor = 0,
+ .device = 0,
+ .channels = 0,
+ .bootable = EOL,
}
};
--- linux-2.5.47/drivers/ide/pci/sis5513.h.old 2002-10-07 15:45:29.000000000 -0500
+++ linux-2.5.47/drivers/ide/pci/sis5513.h 2002-11-11 07:22:07.000000000 -0600
@@ -17,10 +17,10 @@
static ide_pci_host_proc_t sis_procs[] __initdata = {
{
- name: "sis",
- set: 1,
- get_info: sis_get_info,
- parent: NULL,
+ .name = "sis",
+ .set = 1,
+ .get_info = sis_get_info,
+ .parent = NULL,
},
};
#endif /* defined(DISPLAY_SIS_TIMINGS) && defined(CONFIG_PROC_FS) */
@@ -31,23 +31,23 @@
static ide_pci_device_t sis5513_chipsets[] __devinitdata = {
{ /* 0 */
- vendor: PCI_VENDOR_ID_SI,
- device: PCI_DEVICE_ID_SI_5513,
- name: "SIS5513",
- init_chipset: init_chipset_sis5513,
- init_iops: NULL,
- init_hwif: init_hwif_sis5513,
- init_dma: init_dma_sis5513,
- channels: 2,
- autodma: NOAUTODMA,
- enablebits: {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
- bootable: ON_BOARD,
- extra: 0
+ .vendor = PCI_VENDOR_ID_SI,
+ .device = PCI_DEVICE_ID_SI_5513,
+ .name = "SIS5513",
+ .init_chipset = init_chipset_sis5513,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_sis5513,
+ .init_dma = init_dma_sis5513,
+ .channels = 2,
+ .autodma = NOAUTODMA,
+ .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
+ .bootable = ON_BOARD,
+ .extra = 0
},{
- vendor: 0,
- device: 0,
- channels: 0,
- bootable: EOL,
+ .vendor = 0,
+ .device = 0,
+ .channels = 0,
+ .bootable = EOL,
}
};
--- linux-2.5.47/drivers/ide/pci/sl82c105.h.old 2002-10-07 15:45:29.000000000 -0500
+++ linux-2.5.47/drivers/ide/pci/sl82c105.h 2002-11-11 07:22:07.000000000 -0600
@@ -11,23 +11,23 @@
static ide_pci_device_t sl82c105_chipsets[] __devinitdata = {
{ /* 0 */
- vendor: PCI_VENDOR_ID_WINBOND,
- device: PCI_DEVICE_ID_WINBOND_82C105,
- name: "W82C105",
- init_chipset: init_chipset_sl82c105,
- init_iops: NULL,
- init_hwif: init_hwif_sl82c105,
- init_dma: init_dma_sl82c105,
- channels: 2,
- autodma: NOAUTODMA,
- enablebits: {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_WINBOND,
+ .device = PCI_DEVICE_ID_WINBOND_82C105,
+ .name = "W82C105",
+ .init_chipset = init_chipset_sl82c105,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_sl82c105,
+ .init_dma = init_dma_sl82c105,
+ .channels = 2,
+ .autodma = NOAUTODMA,
+ .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{
- vendor: 0,
- device: 0,
- channels: 0,
- bootable: EOL,
+ .vendor = 0,
+ .device = 0,
+ .channels = 0,
+ .bootable = EOL,
}
};
--- linux-2.5.47/drivers/ide/pci/slc90e66.h.old 2002-10-07 15:45:29.000000000 -0500
+++ linux-2.5.47/drivers/ide/pci/slc90e66.h 2002-11-11 07:22:07.000000000 -0600
@@ -19,10 +19,10 @@
static ide_pci_host_proc_t slc90e66_procs[] __initdata = {
{
- name: "slc90e66",
- set: 1,
- get_info: slc90e66_get_info,
- parent: NULL,
+ .name = "slc90e66",
+ .set = 1,
+ .get_info = slc90e66_get_info,
+ .parent = NULL,
},
};
#endif /* defined(DISPLAY_SLC90E66_TIMINGS) && defined(CONFIG_PROC_FS) */
@@ -33,23 +33,23 @@
static ide_pci_device_t slc90e66_chipsets[] __devinitdata = {
{ /* 0 */
- vendor: PCI_VENDOR_ID_EFAR,
- device: PCI_DEVICE_ID_EFAR_SLC90E66_1,
- name: "SLC90E66",
- init_chipset: init_chipset_slc90e66,
- init_iops: NULL,
- init_hwif: init_hwif_slc90e66,
- init_dma: init_dma_slc90e66,
- channels: 2,
- autodma: AUTODMA,
- enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_EFAR,
+ .device = PCI_DEVICE_ID_EFAR_SLC90E66_1,
+ .name = "SLC90E66",
+ .init_chipset = init_chipset_slc90e66,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_slc90e66,
+ .init_dma = init_dma_slc90e66,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{
- vendor: 0,
- device: 0,
- channels: 0,
- bootable: EOL,
+ .vendor = 0,
+ .device = 0,
+ .channels = 0,
+ .bootable = EOL,
}
};
--- linux-2.5.47/drivers/ide/pci/trm290.h.old 2002-10-07 15:45:29.000000000 -0500
+++ linux-2.5.47/drivers/ide/pci/trm290.h 2002-11-11 07:22:07.000000000 -0600
@@ -9,23 +9,23 @@
static ide_pci_device_t trm290_chipsets[] __devinitdata = {
{ /* 0 */
- vendor: PCI_VENDOR_ID_TEKRAM,
- device: PCI_DEVICE_ID_TEKRAM_DC290,
- name: "TRM290",
- init_chipset: NULL,
- init_iops: NULL,
- init_hwif: init_hwif_trm290,
- init_dma: NULL,
- channels: 2,
- autodma: NOAUTODMA,
- enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_TEKRAM,
+ .device = PCI_DEVICE_ID_TEKRAM_DC290,
+ .name = "TRM290",
+ .init_chipset = NULL,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_trm290,
+ .init_dma = NULL,
+ .channels = 2,
+ .autodma = NOAUTODMA,
+ .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{
- vendor: 0,
- device: 0,
- channels: 0,
- bootable: EOL,
+ .vendor = 0,
+ .device = 0,
+ .channels = 0,
+ .bootable = EOL,
}
};
--- linux-2.5.47/drivers/ide/pci/via82cxxx.h.old 2002-10-07 15:45:30.000000000 -0500
+++ linux-2.5.47/drivers/ide/pci/via82cxxx.h 2002-11-11 07:22:07.000000000 -0600
@@ -17,10 +17,10 @@
static ide_pci_host_proc_t via_procs[] __initdata = {
{
- name: "via",
- set: 1,
- get_info: via_get_info,
- parent: NULL,
+ .name = "via",
+ .set = 1,
+ .get_info = via_get_info,
+ .parent = NULL,
},
};
#endif /* DISPLAY_VIA_TIMINGS && CONFIG_PROC_FS */
@@ -31,36 +31,36 @@
static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
{ /* 0 */
- vendor: PCI_VENDOR_ID_VIA,
- device: PCI_DEVICE_ID_VIA_82C576_1,
- name: "VP_IDE",
- init_chipset: init_chipset_via82cxxx,
- init_iops: NULL,
- init_hwif: init_hwif_via82cxxx,
- init_dma: init_dma_via82cxxx,
- channels: 2,
- autodma: NOAUTODMA,
- enablebits: {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_DEVICE_ID_VIA_82C576_1,
+ .name = "VP_IDE",
+ .init_chipset = init_chipset_via82cxxx,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_via82cxxx,
+ .init_dma = init_dma_via82cxxx,
+ .channels = 2,
+ .autodma = NOAUTODMA,
+ .enablebits = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{ /* 1 */
- vendor: PCI_VENDOR_ID_VIA,
- device: PCI_DEVICE_ID_VIA_82C586_1,
- name: "VP_IDE",
- init_chipset: init_chipset_via82cxxx,
- init_iops: NULL,
- init_hwif: init_hwif_via82cxxx,
- init_dma: init_dma_via82cxxx,
- channels: 2,
- autodma: NOAUTODMA,
- enablebits: {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
- bootable: ON_BOARD,
- extra: 0,
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_DEVICE_ID_VIA_82C586_1,
+ .name = "VP_IDE",
+ .init_chipset = init_chipset_via82cxxx,
+ .init_iops = NULL,
+ .init_hwif = init_hwif_via82cxxx,
+ .init_dma = init_dma_via82cxxx,
+ .channels = 2,
+ .autodma = NOAUTODMA,
+ .enablebits = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
+ .bootable = ON_BOARD,
+ .extra = 0,
},{
- vendor: 0,
- device: 0,
- channels: 0,
- bootable: EOL,
+ .vendor = 0,
+ .device = 0,
+ .channels = 0,
+ .bootable = EOL,
}
};
--
They that can give up essential liberty to obtain a little temporary safety
deserve neither liberty nor safety.
-- Benjamin Franklin, Historical Review of Pennsylvania, 1759
Em Mon, Nov 11, 2002 at 09:59:45AM -0600, Art Haas escreveu:
> Here's the second patch for drivers/ide/pci that switch the header files
> (and two lines in serverworks.c) to use C99 designated initializers. The
> patches are against 2.5.47.
Art, comments below
> --- linux-2.5.47/drivers/ide/pci/opti621.h.old 2002-10-07 15:45:28.000000000 -0500
> +++ linux-2.5.47/drivers/ide/pci/opti621.h 2002-11-11 07:22:07.000000000 -0600
> @@ -11,38 +11,38 @@
>
> static ide_pci_device_t opti621_chipsets[] __devinitdata = {
> { /* 0 */
> - vendor: PCI_VENDOR_ID_OPTI,
> - device: PCI_DEVICE_ID_OPTI_82C621,
> - name: "OPTI621",
> - init_setup: init_setup_opti621,
> - init_chipset: NULL,
> - init_iops: NULL,
> - init_hwif: init_hwif_opti621,
> - init_dma: init_dma_opti621,
> - channels: 2,
> - autodma: AUTODMA,
> - enablebits: {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
> - bootable: ON_BOARD,
> - extra: 0,
> + .vendor = PCI_VENDOR_ID_OPTI,
> + .device = PCI_DEVICE_ID_OPTI_82C621,
> + .name = "OPTI621",
> + .init_setup = init_setup_opti621,
> + .init_chipset = NULL,
> + .init_iops = NULL,
Those two lines can be removed
> + .init_hwif = init_hwif_opti621,
> + .init_dma = init_dma_opti621,
> + .channels = 2,
> + .autodma = AUTODMA,
> + .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
> + .bootable = ON_BOARD,
> + .extra = 0,
This one as well
> },{ /* 1 */
> - vendor: PCI_VENDOR_ID_OPTI,
> - device: PCI_DEVICE_ID_OPTI_82C825,
> - name: "OPTI621X",
> - init_setup: init_setup_opti621,
> - init_chipset: NULL,
> - init_iops: NULL,
> - init_hwif: init_hwif_opti621,
> - init_dma: init_dma_opti621,
> - channels: 2,
> - autodma: AUTODMA,
> - enablebits: {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
> - bootable: ON_BOARD,
> - extra: 0,
> + .vendor = PCI_VENDOR_ID_OPTI,
> + .device = PCI_DEVICE_ID_OPTI_82C825,
> + .name = "OPTI621X",
> + .init_setup = init_setup_opti621,
> + .init_chipset = NULL,
> + .init_iops = NULL,
Ditto
> + .init_hwif = init_hwif_opti621,
> + .init_dma = init_dma_opti621,
> + .channels = 2,
> + .autodma = AUTODMA,
> + .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
> + .bootable = ON_BOARD,
> + .extra = 0,
Ditto
> },{
> - vendor: 0,
> - device: 0,
> - channels: 0,
> - bootable: EOL,
> + .vendor = 0,
> + .device = 0,
> + .channels = 0,
> + .bootable = EOL,
> }
Here a { .bootable = EOL, } would do it, no need for the others
Ditto for the other patches that I just snipped
- Arnaldo