Skip to content

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

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

parent 2d8bbe5e
Hide whitespace changes
Inline Side-by-side
Showing with 552 additions and 552 deletions
drivers/ide/pci/adma100.h
View file @ f6cb3993
...@@ -12,24 +12,24 @@ extern void init_dma_pdcadma(ide_hwif_t *, unsigned long); ...@@ -12,24 +12,24 @@ extern 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 = {
{ {
vendor: PCI_VENDOR_ID_PDC, .vendor = PCI_VENDOR_ID_PDC,
device: PCI_DEVICE_ID_PDC_1841, .device = PCI_DEVICE_ID_PDC_1841,
name: "ADMA100", .name = "ADMA100",
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/aec62xx.h
View file @ f6cb3993
...@@ -84,10 +84,10 @@ static int aec62xx_get_info(char *, char **, off_t, int); ...@@ -84,10 +84,10 @@ static int aec62xx_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t aec62xx_procs[] __initdata = { static ide_pci_host_proc_t aec62xx_procs[] __initdata = {
{ {
name: "aec62xx", .name = "aec62xx",
set: 1, .set = 1,
get_info: aec62xx_get_info, .get_info = aec62xx_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* DISPLAY_AEC62XX_TIMINGS && CONFIG_PROC_FS */ #endif /* DISPLAY_AEC62XX_TIMINGS && CONFIG_PROC_FS */
...@@ -100,75 +100,75 @@ static void init_dma_aec62xx(ide_hwif_t *, unsigned long); ...@@ -100,75 +100,75 @@ static void init_dma_aec62xx(ide_hwif_t *, unsigned long);
static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_ARTOP, .vendor = PCI_VENDOR_ID_ARTOP,
device: PCI_DEVICE_ID_ARTOP_ATP850UF, .device = PCI_DEVICE_ID_ARTOP_ATP850UF,
name: "AEC6210", .name = "AEC6210",
init_setup: init_setup_aec62xx, .init_setup = init_setup_aec62xx,
init_chipset: init_chipset_aec62xx, .init_chipset = init_chipset_aec62xx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_aec62xx, .init_hwif = init_hwif_aec62xx,
init_dma: init_dma_aec62xx, .init_dma = init_dma_aec62xx,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 0, .extra = 0,
},{ /* 1 */ },{ /* 1 */
vendor: PCI_VENDOR_ID_ARTOP, .vendor = PCI_VENDOR_ID_ARTOP,
device: PCI_DEVICE_ID_ARTOP_ATP860, .device = PCI_DEVICE_ID_ARTOP_ATP860,
name: "AEC6260", .name = "AEC6260",
init_setup: init_setup_aec62xx, .init_setup = init_setup_aec62xx,
init_chipset: init_chipset_aec62xx, .init_chipset = init_chipset_aec62xx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_aec62xx, .init_hwif = init_hwif_aec62xx,
init_dma: init_dma_aec62xx, .init_dma = init_dma_aec62xx,
channels: 2, .channels = 2,
autodma: NOAUTODMA, .autodma = NOAUTODMA,
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_ARTOP, .vendor = PCI_VENDOR_ID_ARTOP,
device: PCI_DEVICE_ID_ARTOP_ATP860R, .device = PCI_DEVICE_ID_ARTOP_ATP860R,
name: "AEC6260R", .name = "AEC6260R",
init_setup: init_setup_aec62xx, .init_setup = init_setup_aec62xx,
init_chipset: init_chipset_aec62xx, .init_chipset = init_chipset_aec62xx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_aec62xx, .init_hwif = init_hwif_aec62xx,
init_dma: init_dma_aec62xx, .init_dma = init_dma_aec62xx,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
bootable: NEVER_BOARD, .bootable = NEVER_BOARD,
extra: 0, .extra = 0,
},{ /* 3 */ },{ /* 3 */
vendor: PCI_VENDOR_ID_ARTOP, .vendor = PCI_VENDOR_ID_ARTOP,
device: PCI_DEVICE_ID_ARTOP_ATP865, .device = PCI_DEVICE_ID_ARTOP_ATP865,
name: "AEC6X80", .name = "AEC6X80",
init_setup: init_setup_aec6x80, .init_setup = init_setup_aec6x80,
init_chipset: init_chipset_aec62xx, .init_chipset = init_chipset_aec62xx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_aec62xx, .init_hwif = init_hwif_aec62xx,
init_dma: init_dma_aec62xx, .init_dma = init_dma_aec62xx,
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_ARTOP, .vendor = PCI_VENDOR_ID_ARTOP,
device: PCI_DEVICE_ID_ARTOP_ATP865R, .device = PCI_DEVICE_ID_ARTOP_ATP865R,
name: "AEC6X80R", .name = "AEC6X80R",
init_setup: init_setup_aec6x80, .init_setup = init_setup_aec6x80,
init_chipset: init_chipset_aec62xx, .init_chipset = init_chipset_aec62xx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_aec62xx, .init_hwif = init_hwif_aec62xx,
init_dma: init_dma_aec62xx, .init_dma = init_dma_aec62xx,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
bootable: OFF_BOARD, .bootable = OFF_BOARD,
extra: 0, .extra = 0,
} }
}; };
......
drivers/ide/pci/alim15x3.h
View file @ f6cb3993
...@@ -17,10 +17,10 @@ static int ali_get_info(char *, char **, off_t, int); ...@@ -17,10 +17,10 @@ static int ali_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t ali_procs[] __initdata = { static ide_pci_host_proc_t ali_procs[] __initdata = {
{ {
name: "ali", .name = "ali",
set: 1, .set = 1,
get_info: ali_get_info, .get_info = ali_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* DISPLAY_ALI_TIMINGS && CONFIG_PROC_FS */ #endif /* DISPLAY_ALI_TIMINGS && CONFIG_PROC_FS */
...@@ -32,23 +32,23 @@ static void init_dma_ali15x3(ide_hwif_t *, unsigned long); ...@@ -32,23 +32,23 @@ static void init_dma_ali15x3(ide_hwif_t *, unsigned long);
static ide_pci_device_t ali15x3_chipsets[] __devinitdata = { static ide_pci_device_t ali15x3_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_AL, .vendor = PCI_VENDOR_ID_AL,
device: PCI_DEVICE_ID_AL_M5229, .device = PCI_DEVICE_ID_AL_M5229,
name: "ALI15X3", .name = "ALI15X3",
init_chipset: init_chipset_ali15x3, .init_chipset = init_chipset_ali15x3,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_ali15x3, .init_hwif = init_hwif_ali15x3,
init_dma: init_dma_ali15x3, .init_dma = init_dma_ali15x3,
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/amd74xx.h
View file @ f6cb3993
...@@ -17,10 +17,10 @@ static int amd74xx_get_info(char *, char **, off_t, int); ...@@ -17,10 +17,10 @@ static int amd74xx_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t amd74xx_procs[] __initdata = { static ide_pci_host_proc_t amd74xx_procs[] __initdata = {
{ {
name: "amd74xx", .name = "amd74xx",
set: 1, .set = 1,
get_info: amd74xx_get_info, .get_info = amd74xx_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* defined(DISPLAY_VIPER_TIMINGS) && defined(CONFIG_PROC_FS) */ #endif /* defined(DISPLAY_VIPER_TIMINGS) && defined(CONFIG_PROC_FS) */
...@@ -31,75 +31,75 @@ static void init_dma_amd74xx(ide_hwif_t *, unsigned long); ...@@ -31,75 +31,75 @@ static void init_dma_amd74xx(ide_hwif_t *, unsigned long);
static ide_pci_device_t amd74xx_chipsets[] __devinitdata = { static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_AMD, .vendor = PCI_VENDOR_ID_AMD,
device: PCI_DEVICE_ID_AMD_COBRA_7401, .device = PCI_DEVICE_ID_AMD_COBRA_7401,
name: "AMD7401", .name = "AMD7401",
init_chipset: init_chipset_amd74xx, .init_chipset = init_chipset_amd74xx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_amd74xx, .init_hwif = init_hwif_amd74xx,
init_dma: init_dma_amd74xx, .init_dma = init_dma_amd74xx,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x40,0x01,0x01}, {0x40,0x02,0x02}}, .enablebits = {{0x40,0x01,0x01}, {0x40,0x02,0x02}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0 .extra = 0
},{ /* 1 */ },{ /* 1 */
vendor: PCI_VENDOR_ID_AMD, .vendor = PCI_VENDOR_ID_AMD,
device: PCI_DEVICE_ID_AMD_VIPER_7409, .device = PCI_DEVICE_ID_AMD_VIPER_7409,
name: "AMD7409", .name = "AMD7409",
init_chipset: init_chipset_amd74xx, .init_chipset = init_chipset_amd74xx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_amd74xx, .init_hwif = init_hwif_amd74xx,
init_dma: init_dma_amd74xx, .init_dma = init_dma_amd74xx,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x40,0x01,0x01}, {0x40,0x02,0x02}}, .enablebits = {{0x40,0x01,0x01}, {0x40,0x02,0x02}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0 .extra = 0
},{ /* 2 */ },{ /* 2 */
vendor: PCI_VENDOR_ID_AMD, .vendor = PCI_VENDOR_ID_AMD,
device: PCI_DEVICE_ID_AMD_VIPER_7411, .device = PCI_DEVICE_ID_AMD_VIPER_7411,
name: "AMD7411", .name = "AMD7411",
init_chipset: init_chipset_amd74xx, .init_chipset = init_chipset_amd74xx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_amd74xx, .init_hwif = init_hwif_amd74xx,
init_dma: init_dma_amd74xx, .init_dma = init_dma_amd74xx,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x40,0x01,0x01}, {0x40,0x02,0x02}}, .enablebits = {{0x40,0x01,0x01}, {0x40,0x02,0x02}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0 .extra = 0
},{ /* 3 */ },{ /* 3 */
vendor: PCI_VENDOR_ID_AMD, .vendor = PCI_VENDOR_ID_AMD,
device: PCI_DEVICE_ID_AMD_OPUS_7441, .device = PCI_DEVICE_ID_AMD_OPUS_7441,
name: "AMD7441", .name = "AMD7441",
init_chipset: init_chipset_amd74xx, .init_chipset = init_chipset_amd74xx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_amd74xx, .init_hwif = init_hwif_amd74xx,
init_dma: init_dma_amd74xx, .init_dma = init_dma_amd74xx,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x40,0x01,0x01}, {0x40,0x02,0x02}}, .enablebits = {{0x40,0x01,0x01}, {0x40,0x02,0x02}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0 .extra = 0
},{ /* 4 */ },{ /* 4 */
vendor: PCI_VENDOR_ID_AMD, .vendor = PCI_VENDOR_ID_AMD,
device: PCI_DEVICE_ID_AMD_8111_IDE, .device = PCI_DEVICE_ID_AMD_8111_IDE,
name: "AMD8111", .name = "AMD8111",
init_chipset: init_chipset_amd74xx, .init_chipset = init_chipset_amd74xx,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_amd74xx, .init_hwif = init_hwif_amd74xx,
init_dma: init_dma_amd74xx, .init_dma = init_dma_amd74xx,
autodma: AUTODMA, .autodma = AUTODMA,
channels: 2, .channels = 2,
enablebits: {{0x40,0x01,0x01}, {0x40,0x02,0x02}}, .enablebits = {{0x40,0x01,0x01}, {0x40,0x02,0x02}},
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/cmd640.h
View file @ f6cb3993
...@@ -9,23 +9,23 @@ ...@@ -9,23 +9,23 @@
static ide_pci_device_t cmd640_chipsets[] __initdata = { static ide_pci_device_t cmd640_chipsets[] __initdata = {
{ {
vendor: PCI_VENDOR_ID_CMD, .vendor = PCI_VENDOR_ID_CMD,
device: PCI_DEVICE_ID_CMD_640, .device = PCI_DEVICE_ID_CMD_640,
name: "CMD640", .name = "CMD640",
init_setup: NULL, .init_setup = NULL,
init_chipset: NULL, .init_chipset = NULL,
init_iops: NULL, .init_iops = NULL,
init_hwif: IDE_IGNORE, .init_hwif = IDE_IGNORE,
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,
bootable: EOL, .bootable = EOL,
} }
} }
......
drivers/ide/pci/cmd64x.h
View file @ f6cb3993
...@@ -71,10 +71,10 @@ static int cmd64x_get_info(char *, char **, off_t, int); ...@@ -71,10 +71,10 @@ static int cmd64x_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t cmd64x_procs[] __initdata = { static ide_pci_host_proc_t cmd64x_procs[] __initdata = {
{ {
name: "cmd64x", .name = "cmd64x",
set: 1, .set = 1,
get_info: cmd64x_get_info, .get_info = cmd64x_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_PROC_FS) */ #endif /* defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_PROC_FS) */
...@@ -85,62 +85,62 @@ static void init_dma_cmd64x(ide_hwif_t *, unsigned long); ...@@ -85,62 +85,62 @@ static void init_dma_cmd64x(ide_hwif_t *, unsigned long);
static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_CMD, .vendor = PCI_VENDOR_ID_CMD,
device: PCI_DEVICE_ID_CMD_643, .device = PCI_DEVICE_ID_CMD_643,
name: "CMD643", .name = "CMD643",
init_chipset: init_chipset_cmd64x, .init_chipset = init_chipset_cmd64x,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_cmd64x, .init_hwif = init_hwif_cmd64x,
init_dma: init_dma_cmd64x, .init_dma = init_dma_cmd64x,
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_CMD_646, .device = PCI_DEVICE_ID_CMD_646,
name: "CMD646", .name = "CMD646",
init_chipset: init_chipset_cmd64x, .init_chipset = init_chipset_cmd64x,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_cmd64x, .init_hwif = init_hwif_cmd64x,
init_dma: init_dma_cmd64x, .init_dma = init_dma_cmd64x,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x51,0x80,0x80}}, .enablebits = {{0x00,0x00,0x00}, {0x51,0x80,0x80}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 2 */ },{ /* 2 */
vendor: PCI_VENDOR_ID_CMD, .vendor = PCI_VENDOR_ID_CMD,
device: PCI_DEVICE_ID_CMD_648, .device = PCI_DEVICE_ID_CMD_648,
name: "CMD648", .name = "CMD648",
init_chipset: init_chipset_cmd64x, .init_chipset = init_chipset_cmd64x,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_cmd64x, .init_hwif = init_hwif_cmd64x,
init_dma: init_dma_cmd64x, .init_dma = init_dma_cmd64x,
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: PCI_VENDOR_ID_CMD, .vendor = PCI_VENDOR_ID_CMD,
device: PCI_DEVICE_ID_CMD_649, .device = PCI_DEVICE_ID_CMD_649,
name: "CMD649", .name = "CMD649",
init_chipset: init_chipset_cmd64x, .init_chipset = init_chipset_cmd64x,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_cmd64x, .init_hwif = init_hwif_cmd64x,
init_dma: init_dma_cmd64x, .init_dma = init_dma_cmd64x,
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: 2, .channels = 2,
bootable: EOL, .bootable = EOL,
} }
}; };
......
drivers/ide/pci/cs5530.h
View file @ f6cb3993
...@@ -17,10 +17,10 @@ static int cs5530_get_info(char *, char **, off_t, int); ...@@ -17,10 +17,10 @@ static int cs5530_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t cs5530_procs[] __initdata = { static ide_pci_host_proc_t cs5530_procs[] __initdata = {
{ {
name: "cs5530", .name = "cs5530",
set: 1, .set = 1,
get_info: cs5530_get_info, .get_info = cs5530_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* DISPLAY_CS5530_TIMINGS && CONFIG_PROC_FS */ #endif /* DISPLAY_CS5530_TIMINGS && CONFIG_PROC_FS */
...@@ -31,23 +31,23 @@ static void init_dma_cs5530(ide_hwif_t *, unsigned long); ...@@ -31,23 +31,23 @@ static void init_dma_cs5530(ide_hwif_t *, unsigned long);
static ide_pci_device_t cs5530_chipsets[] __devinitdata = { static ide_pci_device_t cs5530_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_CYRIX, .vendor = PCI_VENDOR_ID_CYRIX,
device: PCI_DEVICE_ID_CYRIX_5530_IDE, .device = PCI_DEVICE_ID_CYRIX_5530_IDE,
name: "CS5530", .name = "CS5530",
init_chipset: init_chipset_cs5530, .init_chipset = init_chipset_cs5530,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_cs5530, .init_hwif = init_hwif_cs5530,
init_dma: init_dma_cs5530, .init_dma = init_dma_cs5530,
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/cy82c693.h
View file @ f6cb3993
...@@ -70,23 +70,23 @@ extern void init_iops_cy82c693(ide_hwif_t *); ...@@ -70,23 +70,23 @@ extern void init_iops_cy82c693(ide_hwif_t *);
static ide_pci_device_t cy82c693_chipsets[] __devinitdata = { static ide_pci_device_t cy82c693_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_CONTAQ, .vendor = PCI_VENDOR_ID_CONTAQ,
device: PCI_DEVICE_ID_CONTAQ_82C693, .device = PCI_DEVICE_ID_CONTAQ_82C693,
name: "CY82C693", .name = "CY82C693",
init_chipset: init_chipset_cy82c693, .init_chipset = init_chipset_cy82c693,
init_iops: init_iops_cy82c693, .init_iops = init_iops_cy82c693,
init_hwif: init_hwif_cy82c693, .init_hwif = init_hwif_cy82c693,
init_dma: NULL, .init_dma = NULL,
channels: 1, .channels = 1,
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/generic.h
View file @ f6cb3993
...@@ -11,149 +11,149 @@ static void init_dma_generic(ide_hwif_t *, unsigned long); ...@@ -11,149 +11,149 @@ static void init_dma_generic(ide_hwif_t *, unsigned long);
static ide_pci_device_t generic_chipsets[] __devinitdata = { static ide_pci_device_t generic_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_NS, .vendor = PCI_VENDOR_ID_NS,
device: PCI_DEVICE_ID_NS_87410, .device = PCI_DEVICE_ID_NS_87410,
name: "NS87410", .name = "NS87410",
init_chipset: init_chipset_generic, .init_chipset = init_chipset_generic,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_generic, .init_hwif = init_hwif_generic,
init_dma: init_dma_generic, .init_dma = init_dma_generic,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x43,0x08,0x08}, {0x47,0x08,0x08}}, .enablebits = {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
},{ /* 1 */ },{ /* 1 */
vendor: PCI_VENDOR_ID_PCTECH, .vendor = PCI_VENDOR_ID_PCTECH,
device: PCI_DEVICE_ID_PCTECH_SAMURAI_IDE, .device = PCI_DEVICE_ID_PCTECH_SAMURAI_IDE,
name: "SAMURAI", .name = "SAMURAI",
init_chipset: init_chipset_generic, .init_chipset = init_chipset_generic,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_generic, .init_hwif = init_hwif_generic,
init_dma: init_dma_generic, .init_dma = init_dma_generic,
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_HOLTEK, .vendor = PCI_VENDOR_ID_HOLTEK,
device: PCI_DEVICE_ID_HOLTEK_6565, .device = PCI_DEVICE_ID_HOLTEK_6565,
name: "HT6565", .name = "HT6565",
init_chipset: init_chipset_generic, .init_chipset = init_chipset_generic,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_generic, .init_hwif = init_hwif_generic,
init_dma: init_dma_generic, .init_dma = init_dma_generic,
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_UMC, .vendor = PCI_VENDOR_ID_UMC,
device: PCI_DEVICE_ID_UMC_UM8673F, .device = PCI_DEVICE_ID_UMC_UM8673F,
name: "UM8673F", .name = "UM8673F",
init_chipset: init_chipset_generic, .init_chipset = init_chipset_generic,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_generic, .init_hwif = init_hwif_generic,
init_dma: init_dma_generic, .init_dma = init_dma_generic,
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,
},{ /* 4 */ },{ /* 4 */
vendor: PCI_VENDOR_ID_UMC, .vendor = PCI_VENDOR_ID_UMC,
device: PCI_DEVICE_ID_UMC_UM8886A, .device = PCI_DEVICE_ID_UMC_UM8886A,
name: "UM8886A", .name = "UM8886A",
init_chipset: init_chipset_generic, .init_chipset = init_chipset_generic,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_generic, .init_hwif = init_hwif_generic,
init_dma: init_dma_generic, .init_dma = init_dma_generic,
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,
},{ /* 5 */ },{ /* 5 */
vendor: PCI_VENDOR_ID_UMC, .vendor = PCI_VENDOR_ID_UMC,
device: PCI_DEVICE_ID_UMC_UM8886BF, .device = PCI_DEVICE_ID_UMC_UM8886BF,
name: "UM8886BF", .name = "UM8886BF",
init_chipset: init_chipset_generic, .init_chipset = init_chipset_generic,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_generic, .init_hwif = init_hwif_generic,
init_dma: init_dma_generic, .init_dma = init_dma_generic,
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,
},{ /* 6 */ },{ /* 6 */
vendor: PCI_VENDOR_ID_HINT, .vendor = PCI_VENDOR_ID_HINT,
device: PCI_DEVICE_ID_HINT_VXPROII_IDE, .device = PCI_DEVICE_ID_HINT_VXPROII_IDE,
name: "HINT_IDE", .name = "HINT_IDE",
init_chipset: init_chipset_generic, .init_chipset = init_chipset_generic,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_generic, .init_hwif = init_hwif_generic,
init_dma: init_dma_generic, .init_dma = init_dma_generic,
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,
},{ /* 7 */ },{ /* 7 */
vendor: PCI_VENDOR_ID_VIA, .vendor = PCI_VENDOR_ID_VIA,
device: PCI_DEVICE_ID_VIA_82C561, .device = PCI_DEVICE_ID_VIA_82C561,
name: "VIA_IDE", .name = "VIA_IDE",
init_chipset: init_chipset_generic, .init_chipset = init_chipset_generic,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_generic, .init_hwif = init_hwif_generic,
init_dma: init_dma_generic, .init_dma = init_dma_generic,
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,
},{ /* 8 */ },{ /* 8 */
vendor: PCI_VENDOR_ID_OPTI, .vendor = PCI_VENDOR_ID_OPTI,
device: PCI_DEVICE_ID_OPTI_82C558, .device = PCI_DEVICE_ID_OPTI_82C558,
name: "OPTI621V", .name = "OPTI621V",
init_chipset: init_chipset_generic, .init_chipset = init_chipset_generic,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_generic, .init_hwif = init_hwif_generic,
init_dma: init_dma_generic, .init_dma = init_dma_generic,
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,
} }
}; };
static ide_pci_device_t unknown_chipset[] __devinitdata = { static ide_pci_device_t unknown_chipset[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: 0, .vendor = 0,
device: 0, .device = 0,
name: "PCI_IDE", .name = "PCI_IDE",
init_chipset: init_chipset_generic, .init_chipset = init_chipset_generic,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_generic, .init_hwif = init_hwif_generic,
init_dma: init_dma_generic, .init_dma = init_dma_generic,
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/hpt34x.h
View file @ f6cb3993
...@@ -23,10 +23,10 @@ static int hpt34x_get_info(char *, char **, off_t, int); ...@@ -23,10 +23,10 @@ static int hpt34x_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t hpt34x_procs[] __initdata = { static ide_pci_host_proc_t hpt34x_procs[] __initdata = {
{ {
name: "hpt34x", .name = "hpt34x",
set: 1, .set = 1,
get_info: hpt34x_get_info, .get_info = hpt34x_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* defined(DISPLAY_HPT34X_TIMINGS) && defined(CONFIG_PROC_FS) */ #endif /* defined(DISPLAY_HPT34X_TIMINGS) && defined(CONFIG_PROC_FS) */
...@@ -37,23 +37,23 @@ static void init_dma_hpt34x(ide_hwif_t *, unsigned long); ...@@ -37,23 +37,23 @@ static void init_dma_hpt34x(ide_hwif_t *, unsigned long);
static ide_pci_device_t hpt34x_chipsets[] __devinitdata = { static ide_pci_device_t hpt34x_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_TTI, .vendor = PCI_VENDOR_ID_TTI,
device: PCI_DEVICE_ID_TTI_HPT343, .device = PCI_DEVICE_ID_TTI_HPT343,
name: "HPT34X", .name = "HPT34X",
init_chipset: init_chipset_hpt34x, .init_chipset = init_chipset_hpt34x,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_hpt34x, .init_hwif = init_hwif_hpt34x,
init_dma: init_dma_hpt34x, .init_dma = init_dma_hpt34x,
channels: 2, .channels = 2,
autodma: NOAUTODMA, .autodma = NOAUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, .enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
bootable: NEVER_BOARD, .bootable = NEVER_BOARD,
extra: 16 .extra = 16
},{ },{
vendor: 0, .vendor = 0,
device: 0, .device = 0,
channels: 0, .channels = 0,
bootable: EOL, .bootable = EOL,
} }
}; };
......
drivers/ide/pci/hpt366.h
View file @ f6cb3993
...@@ -426,10 +426,10 @@ static int hpt366_get_info(char *, char **, off_t, int); ...@@ -426,10 +426,10 @@ static int hpt366_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t hpt366_procs[] __initdata = { static ide_pci_host_proc_t hpt366_procs[] __initdata = {
{ {
name: "hpt366", .name = "hpt366",
set: 1, .set = 1,
get_info: hpt366_get_info, .get_info = hpt366_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* defined(DISPLAY_HPT366_TIMINGS) && defined(CONFIG_PROC_FS) */ #endif /* defined(DISPLAY_HPT366_TIMINGS) && defined(CONFIG_PROC_FS) */
...@@ -443,80 +443,80 @@ static void init_dma_hpt366(ide_hwif_t *, unsigned long); ...@@ -443,80 +443,80 @@ static void init_dma_hpt366(ide_hwif_t *, unsigned long);
static ide_pci_device_t hpt366_chipsets[] __devinitdata = { static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_TTI, .vendor = PCI_VENDOR_ID_TTI,
device: PCI_DEVICE_ID_TTI_HPT366, .device = PCI_DEVICE_ID_TTI_HPT366,
name: "HPT366", .name = "HPT366",
init_setup: init_setup_hpt366, .init_setup = init_setup_hpt366,
init_chipset: init_chipset_hpt366, .init_chipset = init_chipset_hpt366,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_hpt366, .init_hwif = init_hwif_hpt366,
init_dma: init_dma_hpt366, .init_dma = init_dma_hpt366,
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: 240 .extra = 240
},{ /* 1 */ },{ /* 1 */
vendor: PCI_VENDOR_ID_TTI, .vendor = PCI_VENDOR_ID_TTI,
device: PCI_DEVICE_ID_TTI_HPT372, .device = PCI_DEVICE_ID_TTI_HPT372,
name: "HPT372A", .name = "HPT372A",
init_setup: init_setup_hpt37x, .init_setup = init_setup_hpt37x,
init_chipset: init_chipset_hpt366, .init_chipset = init_chipset_hpt366,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_hpt366, .init_hwif = init_hwif_hpt366,
init_dma: init_dma_hpt366, .init_dma = init_dma_hpt366,
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_TTI, .vendor = PCI_VENDOR_ID_TTI,
device: PCI_DEVICE_ID_TTI_HPT302, .device = PCI_DEVICE_ID_TTI_HPT302,
name: "HPT302", .name = "HPT302",
init_setup: init_setup_hpt37x, .init_setup = init_setup_hpt37x,
init_chipset: init_chipset_hpt366, .init_chipset = init_chipset_hpt366,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_hpt366, .init_hwif = init_hwif_hpt366,
init_dma: init_dma_hpt366, .init_dma = init_dma_hpt366,
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
},{ /* 3 */ },{ /* 3 */
vendor: PCI_VENDOR_ID_TTI, .vendor = PCI_VENDOR_ID_TTI,
device: PCI_DEVICE_ID_TTI_HPT371, .device = PCI_DEVICE_ID_TTI_HPT371,
name: "HPT371", .name = "HPT371",
init_setup: init_setup_hpt37x, .init_setup = init_setup_hpt37x,
init_chipset: init_chipset_hpt366, .init_chipset = init_chipset_hpt366,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_hpt366, .init_hwif = init_hwif_hpt366,
init_dma: init_dma_hpt366, .init_dma = init_dma_hpt366,
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_TTI, .vendor = PCI_VENDOR_ID_TTI,
device: PCI_DEVICE_ID_TTI_HPT374, .device = PCI_DEVICE_ID_TTI_HPT374,
name: "HPT374", .name = "HPT374",
init_setup: init_setup_hpt374, .init_setup = init_setup_hpt374,
init_chipset: init_chipset_hpt366, .init_chipset = init_chipset_hpt366,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_hpt366, .init_hwif = init_hwif_hpt366,
init_dma: init_dma_hpt366, .init_dma = init_dma_hpt366,
channels: 2, /* 4 */ .channels = 2, /* 4 */
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/it8172.h
View file @ f6cb3993
...@@ -21,24 +21,24 @@ static void init_dma_it8172(ide_hwif_t *, unsigned long); ...@@ -21,24 +21,24 @@ static void init_dma_it8172(ide_hwif_t *, unsigned long);
static ide_pci_device_t it8172_chipsets[] __devinitdata = { static ide_pci_device_t it8172_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_ITE, .vendor = PCI_VENDOR_ID_ITE,
device: PCI_DEVICE_ID_ITE_IT8172G, .device = PCI_DEVICE_ID_ITE_IT8172G,
name: "IT8172G", .name = "IT8172G",
init_setup: init_setup_it8172, .init_setup = init_setup_it8172,
init_chipset: init_chipset_it8172, .init_chipset = init_chipset_it8172,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_it8172, .init_hwif = init_hwif_it8172,
init_dma: init_dma_it8172, .init_dma = init_dma_it8172,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x00,0x00,0x00}, {0x40,0x00,0x01}}, .enablebits = {{0x00,0x00,0x00}, {0x40,0x00,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,
} }
}; };
......
drivers/ide/pci/ns87415.h
View file @ f6cb3993
...@@ -10,23 +10,23 @@ static void init_dma_ns87415(ide_hwif_t *, unsigned long); ...@@ -10,23 +10,23 @@ static void init_dma_ns87415(ide_hwif_t *, unsigned long);
static ide_pci_device_t ns87415_chipsets[] __devinitdata = { static ide_pci_device_t ns87415_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
vendor: PCI_VENDOR_ID_NS, .vendor = PCI_VENDOR_ID_NS,
device: PCI_DEVICE_ID_NS_87415, .device = PCI_DEVICE_ID_NS_87415,
name: "NS87415", .name = "NS87415",
init_chipset: NULL, .init_chipset = NULL,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_ns87415, .init_hwif = init_hwif_ns87415,
init_dma: init_dma_ns87415, .init_dma = init_dma_ns87415,
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/nvidia.h
View file @ f6cb3993
...@@ -17,10 +17,10 @@ static int nforce_get_info(char *, char **, off_t, int); ...@@ -17,10 +17,10 @@ static int nforce_get_info(char *, char **, off_t, int);
static ide_pci_host_proc_t nforce_procs[] __initdata = { static ide_pci_host_proc_t nforce_procs[] __initdata = {
{ {
name: "nforce", .name = "nforce",
set: 1, .set = 1,
get_info: nforce_get_info, .get_info = nforce_get_info,
parent: NULL, .parent = NULL,
}, },
}; };
#endif /* defined(DISPLAY_NFORCE_TIMINGS) && defined(CONFIG_PROC_FS) */ #endif /* defined(DISPLAY_NFORCE_TIMINGS) && defined(CONFIG_PROC_FS) */
...@@ -31,18 +31,18 @@ static void init_dma_nforce(ide_hwif_t *, unsigned long); ...@@ -31,18 +31,18 @@ static void init_dma_nforce(ide_hwif_t *, unsigned long);
static ide_pci_device_t nvidia_chipsets[] __devinitdata = { static ide_pci_device_t nvidia_chipsets[] __devinitdata = {
{ {
vendor: PCI_VENDOR_ID_NVIDIA, .vendor = PCI_VENDOR_ID_NVIDIA,
device: PCI_DEVICE_ID_NVIDIA_NFORCE_IDE, .device = PCI_DEVICE_ID_NVIDIA_NFORCE_IDE,
name: "NFORCE", .name = "NFORCE",
init_chipset: init_chipset_nforce, .init_chipset = init_chipset_nforce,
init_iops: NULL, .init_iops = NULL,
init_hwif: init_hwif_nforce, .init_hwif = init_hwif_nforce,
init_dma: init_dma_nforce, .init_dma = init_dma_nforce,
channels: 2, .channels = 2,
autodma: AUTODMA, .autodma = AUTODMA,
enablebits: {{0x50,0x01,0x01}, {0x50,0x02,0x02}}, .enablebits = {{0x50,0x01,0x01}, {0x50,0x02,0x02}},
bootable: ON_BOARD, .bootable = ON_BOARD,
extra: 0, .extra = 0,
} }
}; };
......
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