Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / drivers / ide / pci / alim15x3.c

diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 1ab769b..49aa82e 100644 (file)
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/alim15x3.c            Version 0.28    Sep 15 2007
+ * linux/drivers/ide/pci/alim15x3.c            Version 0.29    Sep 16 2007
  *
  *  Copyright (C) 1998-2000 Michel Aubry, Maintainer
  *  Copyright (C) 1998-2000 Andrzej Krzysztofowicz, Maintainer
@@ -402,9 +402,6 @@ static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed)
        u8 tmpbyte              = 0x00;
        int m5229_udma          = (hwif->channel) ? 0x57 : 0x56;
 
-       if (speed < XFER_PIO_0)
-               return;
-
        if (speed == XFER_UDMA_6)
                speed1 = 0x47;
 
@@ -603,6 +600,11 @@ static int ali_cable_override(struct pci_dev *pdev)
            pdev->subsystem_device == 0x10AF)
                return 1;
 
+       /* Mitac 8317 (Winbook-A) and relatives */
+       if (pdev->subsystem_vendor == 0x1071 &&
+           pdev->subsystem_device == 0x8317)
+               return 1;
+
        /* Systems by DMI */
        if (dmi_check_system(cable_dmi_table))
                return 1;
@@ -666,31 +668,9 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif)
        hwif->set_dma_mode = &ali_set_dma_mode;
        hwif->udma_filter = &ali_udma_filter;
 
-       /* don't use LBA48 DMA on ALi devices before rev 0xC5 */
-       if (m5229_revision <= 0xC4)
-               hwif->host_flags |= IDE_HFLAG_NO_LBA48_DMA;
-
        if (hwif->dma_base == 0)
                return;
 
-       /*
-        * check in ->init_dma guarantees m5229_revision >= 0x20 here
-        */
-
-       if (m5229_revision == 0x20)
-               hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
-
-       if (m5229_revision <= 0x20)
-               hwif->ultra_mask = 0x00; /* no udma */
-       else if (m5229_revision < 0xC2)
-               hwif->ultra_mask = ATA_UDMA2;
-       else if (m5229_revision == 0xC2 || m5229_revision == 0xC3)
-               hwif->ultra_mask = ATA_UDMA4;
-       else if (m5229_revision == 0xC4)
-               hwif->ultra_mask = ATA_UDMA5;
-       else
-               hwif->ultra_mask = ATA_UDMA6;
-
        hwif->dma_setup = &ali15x3_dma_setup;
 
        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
@@ -768,7 +748,7 @@ static void __devinit init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase)
        ide_setup_dma(hwif, dmabase, 8);
 }
 
-static ide_pci_device_t ali15x3_chipset __devinitdata = {
+static const struct ide_port_info ali15x3_chipset __devinitdata = {
        .name           = "ALI15X3",
        .init_chipset   = init_chipset_ali15x3,
        .init_hwif      = init_hwif_ali15x3,
@@ -794,15 +774,34 @@ static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_dev
                { },
        };
 
-       ide_pci_device_t *d = &ali15x3_chipset;
+       struct ide_port_info d = ali15x3_chipset;
+       u8 rev = dev->revision;
 
        if (pci_dev_present(ati_rs100))
                printk(KERN_WARNING "alim15x3: ATI Radeon IGP Northbridge is not yet fully tested.\n");
 
+       /* don't use LBA48 DMA on ALi devices before rev 0xC5 */
+       if (rev <= 0xC4)
+               d.host_flags |= IDE_HFLAG_NO_LBA48_DMA;
+
+       if (rev >= 0x20) {
+               if (rev == 0x20)
+                       d.host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
+
+               if (rev < 0xC2)
+                       d.udma_mask = ATA_UDMA2;
+               else if (rev == 0xC2 || rev == 0xC3)
+                       d.udma_mask = ATA_UDMA4;
+               else if (rev == 0xC4)
+                       d.udma_mask = ATA_UDMA5;
+               else
+                       d.udma_mask = ATA_UDMA6;
+       }
+
 #if defined(CONFIG_SPARC64)
-       d->init_hwif = init_hwif_common_ali15x3;
+       d.init_hwif = init_hwif_common_ali15x3;
 #endif /* CONFIG_SPARC64 */
-       return ide_setup_pci_device(dev, d);
+       return ide_setup_pci_device(dev, &d);
 }