Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=aa79a2faa01ded0a6a4929dd37c059bef4890838
Commit:     aa79a2faa01ded0a6a4929dd37c059bef4890838
Parent:     a42bcc0f2fc380fac81a7ac525a70bbef44bb042
Author:     Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Sat Jan 26 20:13:08 2008 +0100
Committer:  Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Sat Jan 26 20:13:08 2008 +0100

    au1xxx-ide: use ide_init_port_hw()
    
    Acked-by: Sergei Shtylyov <[EMAIL PROTECTED]>
    Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
 drivers/ide/mips/au1xxx-ide.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index e1f5356..2d3e511 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)
        /* FIXME:  This might possibly break PCMCIA IDE devices */
 
        hwif                            = &ide_hwifs[pdev->id];
-       hwif->irq                       = ahwif->irq;
-       hwif->chipset                   = ide_au1xxx;
 
        memset(&hw, 0, sizeof(hw));
        auide_setup_ports(&hw, ahwif);
-       memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
+       hw.irq = ahwif->irq;
+       hw.chipset = ide_au1xxx;
+
+       ide_init_port_hw(hwif, &hw);
 
        hwif->ultra_mask                = 0x0;  /* Disable Ultra DMA */
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
@@ -644,7 +645,6 @@ static int au_ide_probe(struct device *dev)
        hwif->pio_mask = ATA_PIO4;
        hwif->host_flags = IDE_HFLAG_POST_SET_MODE;
 
-       hwif->noprobe = 0;
        hwif->drives[0].unmask          = 1;
        hwif->drives[1].unmask          = 1;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to