aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 14:13:08 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 14:13:08 -0500
commitaa79a2faa01ded0a6a4929dd37c059bef4890838 (patch)
treeaa15fab9129e68e930e2b29380526e3a4ed2ed67 /drivers/ide
parenta42bcc0f2fc380fac81a7ac525a70bbef44bb042 (diff)
au1xxx-ide: use ide_init_port_hw()
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/mips/au1xxx-ide.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index e1f5356f91e0..2d3e5115b834 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -625,12 +625,13 @@ static int au_ide_probe(struct device *dev)
625 /* FIXME: This might possibly break PCMCIA IDE devices */ 625 /* FIXME: This might possibly break PCMCIA IDE devices */
626 626
627 hwif = &ide_hwifs[pdev->id]; 627 hwif = &ide_hwifs[pdev->id];
628 hwif->irq = ahwif->irq;
629 hwif->chipset = ide_au1xxx;
630 628
631 memset(&hw, 0, sizeof(hw)); 629 memset(&hw, 0, sizeof(hw));
632 auide_setup_ports(&hw, ahwif); 630 auide_setup_ports(&hw, ahwif);
633 memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports)); 631 hw.irq = ahwif->irq;
632 hw.chipset = ide_au1xxx;
633
634 ide_init_port_hw(hwif, &hw);
634 635
635 hwif->ultra_mask = 0x0; /* Disable Ultra DMA */ 636 hwif->ultra_mask = 0x0; /* Disable Ultra DMA */
636#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA 637#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
@@ -644,7 +645,6 @@ static int au_ide_probe(struct device *dev)
644 hwif->pio_mask = ATA_PIO4; 645 hwif->pio_mask = ATA_PIO4;
645 hwif->host_flags = IDE_HFLAG_POST_SET_MODE; 646 hwif->host_flags = IDE_HFLAG_POST_SET_MODE;
646 647
647 hwif->noprobe = 0;
648 hwif->drives[0].unmask = 1; 648 hwif->drives[0].unmask = 1;
649 hwif->drives[1].unmask = 1; 649 hwif->drives[1].unmask = 1;
650 650