Skip to content

L
linux
Commit be00419b authored by Art Haas's avatar Art Haas Committed by Andy Grover
Browse files
Options

[PATCH] C99 designated initializers for drivers/ide/pci (2 of 2)

parent e3ee9b13
Show whitespace changes
Inline Side-by-side
Showing with 672 additions and 672 deletions
drivers/ide/pci/opti621.h
View file @ be00419b
...@@ -11,38 +11,38 @@ static void init_dma_opti621(ide_hwif_t *, unsigned long); ...@@ -11,38 +11,38 @@ static void init_dma_opti621(ide_hwif_t *, unsigned long);
static ide_pci_device_t opti621_chipsets[] __devinitdata = { static ide_pci_device_t opti621_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_OPTI, .vendor = PCI_VENDOR_ID_OPTI,
device: PCI_DEVICE_ID_OPTI_82C621, .device = PCI_DEVICE_ID_OPTI_82C621,
name: "OPTI621", .name = "OPTI621",
init_setup: init_setup_opti621, .init_setup = init_setup_opti621,
init_chipset: NULL, .init_chipset = NULL,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_opti621, .init_hwif = init_hwif_opti621,
init_dma: init_dma_opti621, .init_dma = init_dma_opti621,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x45,0x80,0x00}, {0x40,0x08,0x00}}, .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 1 */ },{ /* 1 */
vendor: PCI_VENDOR_ID_OPTI, .vendor = PCI_VENDOR_ID_OPTI,
device: PCI_DEVICE_ID_OPTI_82C825, .device = PCI_DEVICE_ID_OPTI_82C825,
name: "OPTI621X", .name = "OPTI621X",
init_setup: init_setup_opti621, .init_setup = init_setup_opti621,
init_chipset: NULL, .init_chipset = NULL,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_opti621, .init_hwif = init_hwif_opti621,
init_dma: init_dma_opti621, .init_dma = init_dma_opti621,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x45,0x80,0x00}, {0x40,0x08,0x00}}, .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ },{
vendor: 0, .vendor = 0,
device: 0, .device = 0,
channels: 0, .channels = 0,
bootable: EOL, .bootable = EOL,
} }
}; };
......
drivers/ide/pci/pdc202xx_new.h
View file @ be00419b
...@@ -209,10 +209,10 @@ static int pdcnew_get_info(char *, char **, off_t, int); ...@@ -209,10 +209,10 @@ static int pdcnew_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t pdcnew_procs[] __initdata = { static ide_pci_host_proc_t pdcnew_procs[] __initdata = {
{ {
name: "pdcnew", .name = "pdcnew",
set: 1, .set = 1,
get_info: pdcnew_get_info, .get_info = pdcnew_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* DISPLAY_PDC202XX_TIMINGS && CONFIG_PROC_FS */ #endif /* DISPLAY_PDC202XX_TIMINGS && CONFIG_PROC_FS */
...@@ -227,116 +227,116 @@ static void init_dma_pdc202new(ide_hwif_t *, unsigned long); ...@@ -227,116 +227,116 @@ static void init_dma_pdc202new(ide_hwif_t *, unsigned long);
static ide_pci_device_t pdcnew_chipsets[] __devinitdata = { static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_PROMISE, .vendor = PCI_VENDOR_ID_PROMISE,
device: PCI_DEVICE_ID_PROMISE_20268, .device = PCI_DEVICE_ID_PROMISE_20268,
name: "PDC20268", .name = "PDC20268",
init_setup: init_setup_pdcnew, .init_setup = init_setup_pdcnew,
init_chipset: init_chipset_pdcnew, .init_chipset = init_chipset_pdcnew,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_pdc202new, .init_hwif = init_hwif_pdc202new,
init_dma: init_dma_pdc202new, .init_dma = init_dma_pdc202new,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 0, .extra = 0,
},{ /* 1 */ },{ /* 1 */
vendor: PCI_VENDOR_ID_PROMISE, .vendor = PCI_VENDOR_ID_PROMISE,
device: PCI_DEVICE_ID_PROMISE_20269, .device = PCI_DEVICE_ID_PROMISE_20269,
name: "PDC20269", .name = "PDC20269",
init_setup: init_setup_pdcnew, .init_setup = init_setup_pdcnew,
init_chipset: init_chipset_pdcnew, .init_chipset = init_chipset_pdcnew,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_pdc202new, .init_hwif = init_hwif_pdc202new,
init_dma: init_dma_pdc202new, .init_dma = init_dma_pdc202new,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 0, .extra = 0,
},{ /* 2 */ },{ /* 2 */
vendor: PCI_VENDOR_ID_PROMISE, .vendor = PCI_VENDOR_ID_PROMISE,
device: PCI_DEVICE_ID_PROMISE_20270, .device = PCI_DEVICE_ID_PROMISE_20270,
name: "PDC20270", .name = "PDC20270",
init_setup: init_setup_pdc20270, .init_setup = init_setup_pdc20270,
init_chipset: init_chipset_pdcnew, .init_chipset = init_chipset_pdcnew,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_pdc202new, .init_hwif = init_hwif_pdc202new,
init_dma: init_dma_pdc202new, .init_dma = init_dma_pdc202new,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE #ifdef CONFIG_PDC202XX_FORCE
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
#else /* !CONFIG_PDC202XX_FORCE */ #else /* !CONFIG_PDC202XX_FORCE */
enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif #endif
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 0, .extra = 0,
},{ /* 3 */ },{ /* 3 */
vendor: PCI_VENDOR_ID_PROMISE, .vendor = PCI_VENDOR_ID_PROMISE,
device: PCI_DEVICE_ID_PROMISE_20271, .device = PCI_DEVICE_ID_PROMISE_20271,
name: "PDC20271", .name = "PDC20271",
init_setup: init_setup_pdcnew, .init_setup = init_setup_pdcnew,
init_chipset: init_chipset_pdcnew, .init_chipset = init_chipset_pdcnew,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_pdc202new, .init_hwif = init_hwif_pdc202new,
init_dma: init_dma_pdc202new, .init_dma = init_dma_pdc202new,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 0, .extra = 0,
},{ /* 4 */ },{ /* 4 */
vendor: PCI_VENDOR_ID_PROMISE, .vendor = PCI_VENDOR_ID_PROMISE,
device: PCI_DEVICE_ID_PROMISE_20275, .device = PCI_DEVICE_ID_PROMISE_20275,
name: "PDC20275", .name = "PDC20275",
init_setup: init_setup_pdcnew, .init_setup = init_setup_pdcnew,
init_chipset: init_chipset_pdcnew, .init_chipset = init_chipset_pdcnew,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_pdc202new, .init_hwif = init_hwif_pdc202new,
init_dma: init_dma_pdc202new, .init_dma = init_dma_pdc202new,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 0, .extra = 0,
},{ /* 5 */ },{ /* 5 */
vendor: PCI_VENDOR_ID_PROMISE, .vendor = PCI_VENDOR_ID_PROMISE,
device: PCI_DEVICE_ID_PROMISE_20276, .device = PCI_DEVICE_ID_PROMISE_20276,
name: "PDC20276", .name = "PDC20276",
init_setup: init_setup_pdc20276, .init_setup = init_setup_pdc20276,
init_chipset: init_chipset_pdcnew, .init_chipset = init_chipset_pdcnew,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_pdc202new, .init_hwif = init_hwif_pdc202new,
init_dma: init_dma_pdc202new, .init_dma = init_dma_pdc202new,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE #ifdef CONFIG_PDC202XX_FORCE
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
#else /* !CONFIG_PDC202XX_FORCE */ #else /* !CONFIG_PDC202XX_FORCE */
enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif #endif
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 0, .extra = 0,
},{ /* 6 */ },{ /* 6 */
vendor: PCI_VENDOR_ID_PROMISE, .vendor = PCI_VENDOR_ID_PROMISE,
device: PCI_DEVICE_ID_PROMISE_20277, .device = PCI_DEVICE_ID_PROMISE_20277,
name: "PDC20277", .name = "PDC20277",
init_setup: init_setup_pdcnew, .init_setup = init_setup_pdcnew,
init_chipset: init_chipset_pdcnew, .init_chipset = init_chipset_pdcnew,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_pdc202new, .init_hwif = init_hwif_pdc202new,
init_dma: init_dma_pdc202new, .init_dma = init_dma_pdc202new,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 0, .extra = 0,
},{ },{
vendor: 0, .vendor = 0,
device: 0, .device = 0,
channels: 0, .channels = 0,
bootable: EOL, .bootable = EOL,
} }
}; };
......
drivers/ide/pci/pdc202xx_old.h
View file @ be00419b
...@@ -209,10 +209,10 @@ static int pdc202xx_get_info(char *, char **, off_t, int); ...@@ -209,10 +209,10 @@ static int pdc202xx_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t pdc202xx_procs[] __initdata = { static ide_pci_host_proc_t pdc202xx_procs[] __initdata = {
{ {
name: "pdc202xx", .name = "pdc202xx",
set: 1, .set = 1,
get_info: pdc202xx_get_info, .get_info = pdc202xx_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* DISPLAY_PDC202XX_TIMINGS && CONFIG_PROC_FS */ #endif /* DISPLAY_PDC202XX_TIMINGS && CONFIG_PROC_FS */
...@@ -227,99 +227,99 @@ static void init_dma_pdc202xx(ide_hwif_t *, unsigned long); ...@@ -227,99 +227,99 @@ static void init_dma_pdc202xx(ide_hwif_t *, unsigned long);
static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_PROMISE, .vendor = PCI_VENDOR_ID_PROMISE,
device: PCI_DEVICE_ID_PROMISE_20246, .device = PCI_DEVICE_ID_PROMISE_20246,
name: "PDC20246", .name = "PDC20246",
init_setup: init_setup_pdc202ata4, .init_setup = init_setup_pdc202ata4,
init_chipset: init_chipset_pdc202xx, .init_chipset = init_chipset_pdc202xx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_pdc202xx, .init_hwif = init_hwif_pdc202xx,
init_dma: init_dma_pdc202xx, .init_dma = init_dma_pdc202xx,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE #ifdef CONFIG_PDC202XX_FORCE
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
#else /* !CONFIG_PDC202XX_FORCE */ #else /* !CONFIG_PDC202XX_FORCE */
enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif #endif
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 16, .extra = 16,
},{ /* 1 */ },{ /* 1 */
vendor: PCI_VENDOR_ID_PROMISE, .vendor = PCI_VENDOR_ID_PROMISE,
device: PCI_DEVICE_ID_PROMISE_20262, .device = PCI_DEVICE_ID_PROMISE_20262,
name: "PDC20262", .name = "PDC20262",
init_setup: init_setup_pdc202ata4, .init_setup = init_setup_pdc202ata4,
init_chipset: init_chipset_pdc202xx, .init_chipset = init_chipset_pdc202xx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_pdc202xx, .init_hwif = init_hwif_pdc202xx,
init_dma: init_dma_pdc202xx, .init_dma = init_dma_pdc202xx,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE #ifdef CONFIG_PDC202XX_FORCE
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
#else /* !CONFIG_PDC202XX_FORCE */ #else /* !CONFIG_PDC202XX_FORCE */
enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif #endif
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 48, .extra = 48,
},{ /* 2 */ },{ /* 2 */
vendor: PCI_VENDOR_ID_PROMISE, .vendor = PCI_VENDOR_ID_PROMISE,
device: PCI_DEVICE_ID_PROMISE_20263, .device = PCI_DEVICE_ID_PROMISE_20263,
name: "PDC20263", .name = "PDC20263",
init_setup: init_setup_pdc202ata4, .init_setup = init_setup_pdc202ata4,
init_chipset: init_chipset_pdc202xx, .init_chipset = init_chipset_pdc202xx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_pdc202xx, .init_hwif = init_hwif_pdc202xx,
init_dma: init_dma_pdc202xx, .init_dma = init_dma_pdc202xx,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE #ifdef CONFIG_PDC202XX_FORCE
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
#else /* !CONFIG_PDC202XX_FORCE */ #else /* !CONFIG_PDC202XX_FORCE */
enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif #endif
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 48, .extra = 48,
},{ /* 3 */ },{ /* 3 */
vendor: PCI_VENDOR_ID_PROMISE, .vendor = PCI_VENDOR_ID_PROMISE,
device: PCI_DEVICE_ID_PROMISE_20265, .device = PCI_DEVICE_ID_PROMISE_20265,
name: "PDC20265", .name = "PDC20265",
init_setup: init_setup_pdc20265, .init_setup = init_setup_pdc20265,
init_chipset: init_chipset_pdc202xx, .init_chipset = init_chipset_pdc202xx,
init_hwif: init_hwif_pdc202xx, .init_hwif = init_hwif_pdc202xx,
init_dma: init_dma_pdc202xx, .init_dma = init_dma_pdc202xx,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE #ifdef CONFIG_PDC202XX_FORCE
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
#else /* !CONFIG_PDC202XX_FORCE */ #else /* !CONFIG_PDC202XX_FORCE */
enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif #endif
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 48, .extra = 48,
},{ /* 4 */ },{ /* 4 */
vendor: PCI_VENDOR_ID_PROMISE, .vendor = PCI_VENDOR_ID_PROMISE,
device: PCI_DEVICE_ID_PROMISE_20267, .device = PCI_DEVICE_ID_PROMISE_20267,
name: "PDC20267", .name = "PDC20267",
init_setup: init_setup_pdc202xx, .init_setup = init_setup_pdc202xx,
init_chipset: init_chipset_pdc202xx, .init_chipset = init_chipset_pdc202xx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_pdc202xx, .init_hwif = init_hwif_pdc202xx,
init_dma: init_dma_pdc202xx, .init_dma = init_dma_pdc202xx,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
#ifdef CONFIG_PDC202XX_FORCE #ifdef CONFIG_PDC202XX_FORCE
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
#else /* !CONFIG_PDC202XX_FORCE */ #else /* !CONFIG_PDC202XX_FORCE */
enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif #endif
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 48, .extra = 48,
},{ },{
vendor: 0, .vendor = 0,
device: 0, .device = 0,
channels: 0, .channels = 0,
bootable: EOL, .bootable = EOL,
} }
}; };
......
drivers/ide/pci/pdcadma.h
View file @ be00419b
...@@ -17,10 +17,10 @@ static int pdcadma_get_info(char *, char **, off_t, int); ...@@ -17,10 +17,10 @@ static int pdcadma_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t pdcadma_procs[] __initdata = { static ide_pci_host_proc_t pdcadma_procs[] __initdata = {
{ {
name: "pdcadma", .name = "pdcadma",
set: 1, .set = 1,
get_info: pdcadma_get_info, .get_info = pdcadma_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* defined(DISPLAY_PDCADMA_TIMINGS) && defined(CONFIG_PROC_FS) */ #endif /* defined(DISPLAY_PDCADMA_TIMINGS) && defined(CONFIG_PROC_FS) */
...@@ -32,24 +32,24 @@ static void init_dma_pdcadma(ide_hwif_t *, unsigned long); ...@@ -32,24 +32,24 @@ static void init_dma_pdcadma(ide_hwif_t *, unsigned long);
static ide_pci_device_t pdcadma_chipsets[] __devinitdata = { static ide_pci_device_t pdcadma_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_PDC, .vendor = PCI_VENDOR_ID_PDC,
device: PCI_DEVICE_ID_PDC_1841, .device = PCI_DEVICE_ID_PDC_1841,
name: "PDCADMA", .name = "PDCADMA",
init_setup: init_setup_pdcadma, .init_setup = init_setup_pdcadma,
init_chipset: init_chipset_pdcadma, .init_chipset = init_chipset_pdcadma,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_pdcadma, .init_hwif = init_hwif_pdcadma,
init_dma: init_dma_pdcadma, .init_dma = init_dma_pdcadma,
channels: 2, .channels = 2,
autodma: NODMA, .autodma = NODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 0, .extra = 0,
},{ },{
vendor: 0, .vendor = 0,
device: 0, .device = 0,
channels: 0, .channels = 0,
bootable: EOL, .bootable = EOL,
} }
}; };
......
drivers/ide/pci/piix.h
View file @ be00419b
...@@ -19,10 +19,10 @@ static int piix_get_info(char *, char **, off_t, int); ...@@ -19,10 +19,10 @@ static int piix_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t piix_procs[] __devinitdata = { static ide_pci_host_proc_t piix_procs[] __devinitdata = {
{ {
name: "piix", .name = "piix",
set: 1, .set = 1,
get_info: piix_get_info, .get_info = piix_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* defined(DISPLAY_PIIX_TIMINGS) && defined(CONFIG_PROC_FS) */ #endif /* defined(DISPLAY_PIIX_TIMINGS) && defined(CONFIG_PROC_FS) */
...@@ -40,235 +40,235 @@ static void init_dma_piix(ide_hwif_t *, unsigned long); ...@@ -40,235 +40,235 @@ static void init_dma_piix(ide_hwif_t *, unsigned long);
static ide_pci_device_t piix_pci_info[] __devinitdata = { static ide_pci_device_t piix_pci_info[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82371FB_0, .device = PCI_DEVICE_ID_INTEL_82371FB_0,
name: "PIIXa", .name = "PIIXa",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 1 */ },{ /* 1 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82371FB_1, .device = PCI_DEVICE_ID_INTEL_82371FB_1,
name: "PIIXb", .name = "PIIXb",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 2 */ },{ /* 2 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82371MX, .device = PCI_DEVICE_ID_INTEL_82371MX,
name: "MPIIX", .name = "MPIIX",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: NULL, .init_chipset = NULL,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: NULL, .init_dma = NULL,
channels: 2, .channels = 2,
autodma: NODMA, .autodma = NODMA,
enablebits: {{0x6D,0x80,0x80}, {0x6F,0x80,0x80}}, .enablebits = {{0x6D,0x80,0x80}, {0x6F,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 3 */ },{ /* 3 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82371SB_1, .device = PCI_DEVICE_ID_INTEL_82371SB_1,
name: "PIIX3", .name = "PIIX3",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 4 */ },{ /* 4 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82371AB, .device = PCI_DEVICE_ID_INTEL_82371AB,
name: "PIIX4", .name = "PIIX4",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 5 */ },{ /* 5 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82801AB_1, .device = PCI_DEVICE_ID_INTEL_82801AB_1,
name: "ICH0", .name = "ICH0",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 6 */ },{ /* 6 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82443MX_1, .device = PCI_DEVICE_ID_INTEL_82443MX_1,
name: "PIIX4", .name = "PIIX4",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 7 */ },{ /* 7 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82801AA_1, .device = PCI_DEVICE_ID_INTEL_82801AA_1,
name: "ICH", .name = "ICH",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 8 */ },{ /* 8 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82372FB_1, .device = PCI_DEVICE_ID_INTEL_82372FB_1,
name: "PIIX4", .name = "PIIX4",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 9 */ },{ /* 9 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82451NX, .device = PCI_DEVICE_ID_INTEL_82451NX,
name: "PIIX4", .name = "PIIX4",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: NOAUTODMA, .autodma = NOAUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 10 */ },{ /* 10 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82801BA_9, .device = PCI_DEVICE_ID_INTEL_82801BA_9,
name: "ICH2", .name = "ICH2",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 11 */ },{ /* 11 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82801BA_8, .device = PCI_DEVICE_ID_INTEL_82801BA_8,
name: "ICH2M", .name = "ICH2M",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 12 */ },{ /* 12 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82801CA_10, .device = PCI_DEVICE_ID_INTEL_82801CA_10,
name: "ICH3M", .name = "ICH3M",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 13 */ },{ /* 13 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82801CA_11, .device = PCI_DEVICE_ID_INTEL_82801CA_11,
name: "ICH3", .name = "ICH3",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 14 */ },{ /* 14 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82801DB_11, .device = PCI_DEVICE_ID_INTEL_82801DB_11,
name: "ICH4", .name = "ICH4",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 15 */ },{ /* 15 */
vendor: PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
device: PCI_DEVICE_ID_INTEL_82801E_11, .device = PCI_DEVICE_ID_INTEL_82801E_11,
name: "C-ICH", .name = "C-ICH",
init_setup: init_setup_piix, .init_setup = init_setup_piix,
init_chipset: init_chipset_piix, .init_chipset = init_chipset_piix,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_piix, .init_hwif = init_hwif_piix,
init_dma: init_dma_piix, .init_dma = init_dma_piix,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ },{
vendor: 0, .vendor = 0,
device: 0, .device = 0,
channels: 0, .channels = 0,
init_setup: NULL, .init_setup = NULL,
bootable: EOL, .bootable = EOL,
} }
}; };
......
drivers/ide/pci/rz1000.h
View file @ be00419b
...@@ -9,36 +9,36 @@ static void init_hwif_rz1000(ide_hwif_t *); ...@@ -9,36 +9,36 @@ static void init_hwif_rz1000(ide_hwif_t *);
static ide_pci_device_t rz1000_chipsets[] __devinitdata = { static ide_pci_device_t rz1000_chipsets[] __devinitdata = {
{ {
vendor: PCI_VENDOR_ID_PCTECH, .vendor = PCI_VENDOR_ID_PCTECH,
device: PCI_DEVICE_ID_PCTECH_RZ1000, .device = PCI_DEVICE_ID_PCTECH_RZ1000,
name: "RZ1000", .name = "RZ1000",
init_chipset: NULL, .init_chipset = NULL,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_rz1000, .init_hwif = init_hwif_rz1000,
init_dma: NULL, .init_dma = NULL,
channels: 2, .channels = 2,
autodma: NODMA, .autodma = NODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ },{
vendor: PCI_VENDOR_ID_PCTECH, .vendor = PCI_VENDOR_ID_PCTECH,
device: PCI_DEVICE_ID_PCTECH_RZ1001, .device = PCI_DEVICE_ID_PCTECH_RZ1001,
name: "RZ1001", .name = "RZ1001",
init_chipset: NULL, .init_chipset = NULL,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_rz1000, .init_hwif = init_hwif_rz1000,
init_dma: NULL, .init_dma = NULL,
channels: 2, .channels = 2,
autodma: NODMA, .autodma = NODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ },{
vendor: 0, .vendor = 0,
device: 0, .device = 0,
channels: 0, .channels = 0,
bootable: EOL, .bootable = EOL,
} }
}; };
......
drivers/ide/pci/serverworks.c
View file @ be00419b
...@@ -801,8 +801,8 @@ static struct pci_driver driver = { ...@@ -801,8 +801,8 @@ static struct pci_driver driver = {
.id_table = svwks_pci_tbl, .id_table = svwks_pci_tbl,
.probe = svwks_init_one, .probe = svwks_init_one,
#if 0 /* FIXME: implement */ #if 0 /* FIXME: implement */
suspend: , .suspend = ,
resume: , .resume = ,
#endif #endif
}; };
......
drivers/ide/pci/serverworks.h
View file @ be00419b
...@@ -23,10 +23,10 @@ static int svwks_get_info(char *, char **, off_t, int); ...@@ -23,10 +23,10 @@ static int svwks_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t svwks_procs[] __initdata = { static ide_pci_host_proc_t svwks_procs[] __initdata = {
{ {
name: "svwks", .name = "svwks",
set: 1, .set = 1,
get_info: svwks_get_info, .get_info = svwks_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* defined(DISPLAY_SVWKS_TIMINGS) && defined(CONFIG_PROC_FS) */ #endif /* defined(DISPLAY_SVWKS_TIMINGS) && defined(CONFIG_PROC_FS) */
...@@ -39,66 +39,66 @@ static void init_dma_svwks(ide_hwif_t *, unsigned long); ...@@ -39,66 +39,66 @@ static void init_dma_svwks(ide_hwif_t *, unsigned long);
static ide_pci_device_t serverworks_chipsets[] __devinitdata = { static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_SERVERWORKS, .vendor = PCI_VENDOR_ID_SERVERWORKS,
device: PCI_DEVICE_ID_SERVERWORKS_OSB4IDE, .device = PCI_DEVICE_ID_SERVERWORKS_OSB4IDE,
name: "SvrWks OSB4", .name = "SvrWks OSB4",
init_setup: init_setup_svwks, .init_setup = init_setup_svwks,
init_chipset: init_chipset_svwks, .init_chipset = init_chipset_svwks,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_svwks, .init_hwif = init_hwif_svwks,
init_dma: NULL, .init_dma = NULL,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 1 */ },{ /* 1 */
vendor: PCI_VENDOR_ID_SERVERWORKS, .vendor = PCI_VENDOR_ID_SERVERWORKS,
device: PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, .device = PCI_DEVICE_ID_SERVERWORKS_CSB5IDE,
name: "SvrWks CSB5", .name = "SvrWks CSB5",
init_setup: init_setup_svwks, .init_setup = init_setup_svwks,
init_chipset: init_chipset_svwks, .init_chipset = init_chipset_svwks,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_svwks, .init_hwif = init_hwif_svwks,
init_dma: init_dma_svwks, .init_dma = init_dma_svwks,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 2 */ },{ /* 2 */
vendor: PCI_VENDOR_ID_SERVERWORKS, .vendor = PCI_VENDOR_ID_SERVERWORKS,
device: PCI_DEVICE_ID_SERVERWORKS_CSB6IDE, .device = PCI_DEVICE_ID_SERVERWORKS_CSB6IDE,
name: "SvrWks CSB6", .name = "SvrWks CSB6",
init_setup: init_setup_csb6, .init_setup = init_setup_csb6,
init_chipset: init_chipset_svwks, .init_chipset = init_chipset_svwks,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_svwks, .init_hwif = init_hwif_svwks,
init_dma: init_dma_svwks, .init_dma = init_dma_svwks,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 3 */ },{ /* 3 */
vendor: PCI_VENDOR_ID_SERVERWORKS, .vendor = PCI_VENDOR_ID_SERVERWORKS,
device: PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2, .device = PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2,
name: "SvrWks CSB6", .name = "SvrWks CSB6",
init_setup: init_setup_csb6, .init_setup = init_setup_csb6,
init_chipset: init_chipset_svwks, .init_chipset = init_chipset_svwks,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_svwks, .init_hwif = init_hwif_svwks,
init_dma: init_dma_svwks, .init_dma = init_dma_svwks,
channels: 1, /* 2 */ .channels = 1, /* 2 */
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ },{
vendor: 0, .vendor = 0,
device: 0, .device = 0,
channels: 0, .channels = 0,
bootable: EOL, .bootable = EOL,
} }
}; };
......
drivers/ide/pci/siimage.h
View file @ be00419b
...@@ -99,10 +99,10 @@ static u8 siimage_proc; ...@@ -99,10 +99,10 @@ static u8 siimage_proc;
static ide_pci_host_proc_t siimage_procs[] __initdata = { static ide_pci_host_proc_t siimage_procs[] __initdata = {
{ {
name: "siimage", .name = "siimage",
set: 1, .set = 1,
get_info: siimage_get_info, .get_info = siimage_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* DISPLAY_SIIMAGE_TIMINGS && CONFIG_PROC_FS */ #endif /* DISPLAY_SIIMAGE_TIMINGS && CONFIG_PROC_FS */
...@@ -114,36 +114,36 @@ static void init_dma_siimage(ide_hwif_t *, unsigned long); ...@@ -114,36 +114,36 @@ static void init_dma_siimage(ide_hwif_t *, unsigned long);
static ide_pci_device_t siimage_chipsets[] __devinitdata = { static ide_pci_device_t siimage_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_CMD, .vendor = PCI_VENDOR_ID_CMD,
device: PCI_DEVICE_ID_SII_680, .device = PCI_DEVICE_ID_SII_680,
name: "SiI680", .name = "SiI680",
init_chipset: init_chipset_siimage, .init_chipset = init_chipset_siimage,
init_iops: init_iops_siimage, .init_iops = init_iops_siimage,
init_hwif: init_hwif_siimage, .init_hwif = init_hwif_siimage,
init_dma: init_dma_siimage, .init_dma = init_dma_siimage,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 1 */ },{ /* 1 */
vendor: PCI_VENDOR_ID_CMD, .vendor = PCI_VENDOR_ID_CMD,
device: PCI_DEVICE_ID_SII_3112, .device = PCI_DEVICE_ID_SII_3112,
name: "SiI3112 Serial ATA", .name = "SiI3112 Serial ATA",
init_chipset: init_chipset_siimage, .init_chipset = init_chipset_siimage,
init_iops: init_iops_siimage, .init_iops = init_iops_siimage,
init_hwif: init_hwif_siimage, .init_hwif = init_hwif_siimage,
init_dma: init_dma_siimage, .init_dma = init_dma_siimage,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ },{
vendor: 0, .vendor = 0,
device: 0, .device = 0,
channels: 0, .channels = 0,
bootable: EOL, .bootable = EOL,
} }
}; };
......
drivers/ide/pci/sis5513.h
View file @ be00419b
...@@ -17,10 +17,10 @@ static int sis_get_info(char *, char **, off_t, int); ...@@ -17,10 +17,10 @@ static int sis_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t sis_procs[] __initdata = { static ide_pci_host_proc_t sis_procs[] __initdata = {
{ {
name: "sis", .name = "sis",
set: 1, .set = 1,
get_info: sis_get_info, .get_info = sis_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* defined(DISPLAY_SIS_TIMINGS) && defined(CONFIG_PROC_FS) */ #endif /* defined(DISPLAY_SIS_TIMINGS) && defined(CONFIG_PROC_FS) */
...@@ -31,23 +31,23 @@ static void init_dma_sis5513(ide_hwif_t *, unsigned long); ...@@ -31,23 +31,23 @@ static void init_dma_sis5513(ide_hwif_t *, unsigned long);
static ide_pci_device_t sis5513_chipsets[] __devinitdata = { static ide_pci_device_t sis5513_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_SI, .vendor = PCI_VENDOR_ID_SI,
device: PCI_DEVICE_ID_SI_5513, .device = PCI_DEVICE_ID_SI_5513,
name: "SIS5513", .name = "SIS5513",
init_chipset: init_chipset_sis5513, .init_chipset = init_chipset_sis5513,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_sis5513, .init_hwif = init_hwif_sis5513,
init_dma: init_dma_sis5513, .init_dma = init_dma_sis5513,
channels: 2, .channels = 2,
autodma: NOAUTODMA, .autodma = NOAUTODMA,
enablebits: {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0 .extra = 0
},{ },{
vendor: 0, .vendor = 0,
device: 0, .device = 0,
channels: 0, .channels = 0,
bootable: EOL, .bootable = EOL,
} }
}; };
......
drivers/ide/pci/sl82c105.h
View file @ be00419b
...@@ -11,23 +11,23 @@ static void init_dma_sl82c105(ide_hwif_t *, unsigned long); ...@@ -11,23 +11,23 @@ static void init_dma_sl82c105(ide_hwif_t *, unsigned long);
static ide_pci_device_t sl82c105_chipsets[] __devinitdata = { static ide_pci_device_t sl82c105_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_WINBOND, .vendor = PCI_VENDOR_ID_WINBOND,
device: PCI_DEVICE_ID_WINBOND_82C105, .device = PCI_DEVICE_ID_WINBOND_82C105,
name: "W82C105", .name = "W82C105",
init_chipset: init_chipset_sl82c105, .init_chipset = init_chipset_sl82c105,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_sl82c105, .init_hwif = init_hwif_sl82c105,
init_dma: init_dma_sl82c105, .init_dma = init_dma_sl82c105,
channels: 2, .channels = 2,
autodma: NOAUTODMA, .autodma = NOAUTODMA,
enablebits: {{0x40,0x01,0x01}, {0x40,0x10,0x10}}, .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ },{
vendor: 0, .vendor = 0,
device: 0, .device = 0,
channels: 0, .channels = 0,
bootable: EOL, .bootable = EOL,
} }
}; };
......
drivers/ide/pci/slc90e66.h
View file @ be00419b
...@@ -19,10 +19,10 @@ static int slc90e66_get_info(char *, char **, off_t, int); ...@@ -19,10 +19,10 @@ static int slc90e66_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t slc90e66_procs[] __initdata = { static ide_pci_host_proc_t slc90e66_procs[] __initdata = {
{ {
name: "slc90e66", .name = "slc90e66",
set: 1, .set = 1,
get_info: slc90e66_get_info, .get_info = slc90e66_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* defined(DISPLAY_SLC90E66_TIMINGS) && defined(CONFIG_PROC_FS) */ #endif /* defined(DISPLAY_SLC90E66_TIMINGS) && defined(CONFIG_PROC_FS) */
...@@ -33,23 +33,23 @@ static void init_dma_slc90e66(ide_hwif_t *, unsigned long); ...@@ -33,23 +33,23 @@ static void init_dma_slc90e66(ide_hwif_t *, unsigned long);
static ide_pci_device_t slc90e66_chipsets[] __devinitdata = { static ide_pci_device_t slc90e66_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_EFAR, .vendor = PCI_VENDOR_ID_EFAR,
device: PCI_DEVICE_ID_EFAR_SLC90E66_1, .device = PCI_DEVICE_ID_EFAR_SLC90E66_1,
name: "SLC90E66", .name = "SLC90E66",
init_chipset: init_chipset_slc90e66, .init_chipset = init_chipset_slc90e66,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_slc90e66, .init_hwif = init_hwif_slc90e66,
init_dma: init_dma_slc90e66, .init_dma = init_dma_slc90e66,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ },{
vendor: 0, .vendor = 0,
device: 0, .device = 0,
channels: 0, .channels = 0,
bootable: EOL, .bootable = EOL,
} }
}; };
......
drivers/ide/pci/trm290.h
View file @ be00419b
...@@ -9,23 +9,23 @@ extern void init_hwif_trm290(ide_hwif_t *); ...@@ -9,23 +9,23 @@ extern void init_hwif_trm290(ide_hwif_t *);
static ide_pci_device_t trm290_chipsets[] __devinitdata = { static ide_pci_device_t trm290_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_TEKRAM, .vendor = PCI_VENDOR_ID_TEKRAM,
device: PCI_DEVICE_ID_TEKRAM_DC290, .device = PCI_DEVICE_ID_TEKRAM_DC290,
name: "TRM290", .name = "TRM290",
init_chipset: NULL, .init_chipset = NULL,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_trm290, .init_hwif = init_hwif_trm290,
init_dma: NULL, .init_dma = NULL,
channels: 2, .channels = 2,
autodma: NOAUTODMA, .autodma = NOAUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ },{
vendor: 0, .vendor = 0,
device: 0, .device = 0,
channels: 0, .channels = 0,
bootable: EOL, .bootable = EOL,
} }
}; };
......
drivers/ide/pci/via82cxxx.h
View file @ be00419b
...@@ -17,10 +17,10 @@ static int via_get_info(char *, char **, off_t, int); ...@@ -17,10 +17,10 @@ static int via_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t via_procs[] __initdata = { static ide_pci_host_proc_t via_procs[] __initdata = {
{ {
name: "via", .name = "via",
set: 1, .set = 1,
get_info: via_get_info, .get_info = via_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* DISPLAY_VIA_TIMINGS && CONFIG_PROC_FS */ #endif /* DISPLAY_VIA_TIMINGS && CONFIG_PROC_FS */
...@@ -31,36 +31,36 @@ static void init_dma_via82cxxx(ide_hwif_t *, unsigned long); ...@@ -31,36 +31,36 @@ static void init_dma_via82cxxx(ide_hwif_t *, unsigned long);
static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = { static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_VIA, .vendor = PCI_VENDOR_ID_VIA,
device: PCI_DEVICE_ID_VIA_82C576_1, .device = PCI_DEVICE_ID_VIA_82C576_1,
name: "VP_IDE", .name = "VP_IDE",
init_chipset: init_chipset_via82cxxx, .init_chipset = init_chipset_via82cxxx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_via82cxxx, .init_hwif = init_hwif_via82cxxx,
init_dma: init_dma_via82cxxx, .init_dma = init_dma_via82cxxx,
channels: 2, .channels = 2,
autodma: NOAUTODMA, .autodma = NOAUTODMA,
enablebits: {{0x40,0x02,0x02}, {0x40,0x01,0x01}}, .enablebits = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 1 */ },{ /* 1 */
vendor: PCI_VENDOR_ID_VIA, .vendor = PCI_VENDOR_ID_VIA,
device: PCI_DEVICE_ID_VIA_82C586_1, .device = PCI_DEVICE_ID_VIA_82C586_1,
name: "VP_IDE", .name = "VP_IDE",
init_chipset: init_chipset_via82cxxx, .init_chipset = init_chipset_via82cxxx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_via82cxxx, .init_hwif = init_hwif_via82cxxx,
init_dma: init_dma_via82cxxx, .init_dma = init_dma_via82cxxx,
channels: 2, .channels = 2,
autodma: NOAUTODMA, .autodma = NOAUTODMA,
enablebits: {{0x40,0x02,0x02}, {0x40,0x01,0x01}}, .enablebits = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ },{
vendor: 0, .vendor = 0,
device: 0, .device = 0,
channels: 0, .channels = 0,
bootable: EOL, .bootable = EOL,
} }
}; };
......
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