Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (33 commits)
  amd74xx: remove /proc/ide/amd74xx
  amd74xx/via82cxxx: don't initialize drive->dn
  sis5513: remove /proc/ide/sis
  ide: remove CONFIG_IDEDMA_ONLYDISK
  ide: add "hdx=nodma" kernel parameter
  ide: remove hwif->autodma and drive->autodma
  ide: remove "idex=dma" kernel parameter
  ide: remove CONFIG_BLK_DEV_IDEDMA_FORCED
  ide: use PCI_VDEVICE() macro
  sis5513: clear prefetch and postwrite for ATAPI devices
  it8213/piix/slc90e66: "de-couple" PIO and UDMA modes
  ide: unexport noautodma
  ide: unexport ide_tune_dma
  ide: remove ->ide_dma_check (take 2)
  ide-pmac: add PIO autotune fallback to ->ide_dma_check
  ide-cris: add PIO autotune fallback to ->ide_dma_check
  sl82c105: add PIO autotune fallback to ->ide_dma_check
  cs5530/sc1200: add PIO autotune fallback to ->ide_dma_check
  ide: remove ide_use_fast_pio()
  ide: remove drive->init_speed zeroing
  ...

1 files changed, 16 insertions, 51 deletions

diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index ebac87f7200a..fa8df6d43832 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/ide/pci/slc90e66.c    Version 0.16    Jul 14, 2007
+ *  linux/drivers/ide/pci/slc90e66.c    Version 0.18    Aug 9, 2007
  *
  *  Copyright (C) 2000-2002 Andre Hedrick <andre@linux-ide.org>
  *  Copyright (C) 2006-2007 MontaVista Software, Inc. <source@mvista.com>
@@ -21,27 +21,6 @@
 
 #include <asm/io.h>
 
-static u8 slc90e66_dma_2_pio (u8 xfer_rate) {
-        switch(xfer_rate) {
-                case XFER_UDMA_4:
-                case XFER_UDMA_3:
-                case XFER_UDMA_2:
-                case XFER_UDMA_1:
-                case XFER_UDMA_0:
-                case XFER_MW_DMA_2:
-                        return 4;
-                case XFER_MW_DMA_1:
-                        return 3;
-                case XFER_SW_DMA_2:
-                        return 2;
-                case XFER_MW_DMA_0:
-                case XFER_SW_DMA_1:
-                case XFER_SW_DMA_0:
-                default:
-                        return 0;
-        }
-}
-
 static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif        = HWIF(drive);
@@ -132,26 +111,21 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)
                         pci_write_config_word(dev, 0x4a, reg4a|u_speed);
                 }
         } else {
+                const u8 mwdma_to_pio[] = { 0, 3, 4 };
+                u8 pio;
+
                 if (reg48 & u_flag)
                         pci_write_config_word(dev, 0x48, reg48 & ~u_flag);
                 if (reg4a & a_speed)
                         pci_write_config_word(dev, 0x4a, reg4a & ~a_speed);
-        }
-
-        slc90e66_set_pio_mode(drive, slc90e66_dma_2_pio(speed));
-}
 
-static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive)
-{
-        drive->init_speed = 0;
-
-        if (ide_tune_dma(drive))
-                return 0;
-
-        if (ide_use_fast_pio(drive))
-                ide_set_max_pio(drive);
+                if (speed >= XFER_MW_DMA_0)
+                        pio = mwdma_to_pio[speed - XFER_MW_DMA_0];
+                else
+                        pio = 2; /* only SWDMA2 is allowed */
 
-        return -1;
+                slc90e66_set_pio_mode(drive, pio);
+        }
 }
 
 static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
@@ -159,8 +133,6 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
         u8 reg47 = 0;
         u8 mask = hwif->channel ? 0x01 : 0x02;  /* bit0:Primary */
 
-        hwif->autodma = 0;
-
         if (!hwif->irq)
                 hwif->irq = hwif->channel ? 15 : 14;
 
@@ -169,11 +141,11 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
 
         pci_read_config_byte(hwif->pci_dev, 0x47, &reg47);
 
-        if (!hwif->dma_base) {
-                hwif->drives[0].autotune = 1;
-                hwif->drives[1].autotune = 1;
+        hwif->drives[0].autotune = 1;
+        hwif->drives[1].autotune = 1;
+
+        if (hwif->dma_base == 0)
                 return;
-        }
 
         hwif->atapi_dma = 1;
         hwif->ultra_mask = 0x1f;
@@ -183,13 +155,6 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
         if (hwif->cbl != ATA_CBL_PATA40_SHORT)
                 /* bit[0(1)]: 0:80, 1:40 */
                 hwif->cbl = (reg47 & mask) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
-
-        hwif->ide_dma_check = &slc90e66_config_drive_xfer_rate;
-
-        if (!noautodma)
-                hwif->autodma = 1;
-        hwif->drives[0].autodma = hwif->autodma;
-        hwif->drives[1].autodma = hwif->autodma;
 }
 
 static ide_pci_device_t slc90e66_chipset __devinitdata = {
@@ -206,8 +171,8 @@ static int __devinit slc90e66_init_one(struct pci_dev *dev, const struct pci_dev
         return ide_setup_pci_device(dev, &slc90e66_chipset);
 }
 
-static struct pci_device_id slc90e66_pci_tbl[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1), 0},
+static const struct pci_device_id slc90e66_pci_tbl[] = {
+        { PCI_VDEVICE(EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1), 0 },
         { 0, },
 };
 MODULE_DEVICE_TABLE(pci, slc90e66_pci_tbl);