diff options
Diffstat (limited to 'drivers/ide/mips/au1xxx-ide.c')
-rw-r--r-- | drivers/ide/mips/au1xxx-ide.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c index 48d57cae63c6..475da582fd89 100644 --- a/drivers/ide/mips/au1xxx-ide.c +++ b/drivers/ide/mips/au1xxx-ide.c | |||
@@ -546,8 +546,8 @@ static int au_ide_probe(struct device *dev) | |||
546 | ide_hwif_t *hwif; | 546 | ide_hwif_t *hwif; |
547 | struct resource *res; | 547 | struct resource *res; |
548 | int ret = 0; | 548 | int ret = 0; |
549 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; | ||
549 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | 550 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; |
550 | hw_regs_t hw; | ||
551 | 551 | ||
552 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA) | 552 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA) |
553 | char *mode = "MWDMA2"; | 553 | char *mode = "MWDMA2"; |
@@ -596,8 +596,6 @@ static int au_ide_probe(struct device *dev) | |||
596 | hw.dev = dev; | 596 | hw.dev = dev; |
597 | hw.chipset = ide_au1xxx; | 597 | hw.chipset = ide_au1xxx; |
598 | 598 | ||
599 | ide_init_port_hw(hwif, &hw); | ||
600 | |||
601 | /* If the user has selected DDMA assisted copies, | 599 | /* If the user has selected DDMA assisted copies, |
602 | then set up a few local I/O function entry points | 600 | then set up a few local I/O function entry points |
603 | */ | 601 | */ |
@@ -611,7 +609,7 @@ static int au_ide_probe(struct device *dev) | |||
611 | 609 | ||
612 | idx[0] = hwif->index; | 610 | idx[0] = hwif->index; |
613 | 611 | ||
614 | ide_device_add(idx, &au1xxx_port_info); | 612 | ide_device_add(idx, &au1xxx_port_info, hws); |
615 | 613 | ||
616 | dev_set_drvdata(dev, hwif); | 614 | dev_set_drvdata(dev, hwif); |
617 | 615 | ||