aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/alim15x3.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/alim15x3.c')
-rw-r--r--drivers/ide/alim15x3.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
index 911a27ca356b..36f76e28a0bf 100644
--- a/drivers/ide/alim15x3.c
+++ b/drivers/ide/alim15x3.c
@@ -415,7 +415,7 @@ static u8 ali_cable_detect(ide_hwif_t *hwif)
415 * Sparc systems. 415 * Sparc systems.
416 */ 416 */
417 417
418static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) 418static void init_hwif_ali15x3(ide_hwif_t *hwif)
419{ 419{
420 u8 ideic, inmir; 420 u8 ideic, inmir;
421 s8 irq_routing_table[] = { -1, 9, 3, 10, 4, 5, 7, 6, 421 s8 irq_routing_table[] = { -1, 9, 3, 10, 4, 5, 7, 6,
@@ -464,8 +464,7 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)
464 * Set up the DMA functionality on the ALi 15x3. 464 * Set up the DMA functionality on the ALi 15x3.
465 */ 465 */
466 466
467static int __devinit init_dma_ali15x3(ide_hwif_t *hwif, 467static int init_dma_ali15x3(ide_hwif_t *hwif, const struct ide_port_info *d)
468 const struct ide_port_info *d)
469{ 468{
470 struct pci_dev *dev = to_pci_dev(hwif->dev); 469 struct pci_dev *dev = to_pci_dev(hwif->dev);
471 unsigned long base = ide_pci_dma_base(hwif, d); 470 unsigned long base = ide_pci_dma_base(hwif, d);
@@ -512,7 +511,7 @@ static const struct ide_dma_ops ali_dma_ops = {
512 .dma_sff_read_status = ide_dma_sff_read_status, 511 .dma_sff_read_status = ide_dma_sff_read_status,
513}; 512};
514 513
515static const struct ide_port_info ali15x3_chipset __devinitconst = { 514static const struct ide_port_info ali15x3_chipset = {
516 .name = DRV_NAME, 515 .name = DRV_NAME,
517 .init_chipset = init_chipset_ali15x3, 516 .init_chipset = init_chipset_ali15x3,
518 .init_hwif = init_hwif_ali15x3, 517 .init_hwif = init_hwif_ali15x3,
@@ -532,7 +531,8 @@ static const struct ide_port_info ali15x3_chipset __devinitconst = {
532 * hot plug layer. 531 * hot plug layer.
533 */ 532 */
534 533
535static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_device_id *id) 534static int alim15x3_init_one(struct pci_dev *dev,
535 const struct pci_device_id *id)
536{ 536{
537 struct ide_port_info d = ali15x3_chipset; 537 struct ide_port_info d = ali15x3_chipset;
538 u8 rev = dev->revision, idx = id->driver_data; 538 u8 rev = dev->revision, idx = id->driver_data;