Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[mv-sheeva.git] / drivers / ide / pci / jmicron.c

diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index d379fbaf67434535a7162a4ef5acbd8c97b66876..bb893ffcc987f646e5ad651249cb44388a9fb542 100644 (file)
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -85,39 +85,18 @@ static u8 __devinit ata66_jmicron(ide_hwif_t *hwif)
 
 static void jmicron_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-       ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
 
 /**
- *     jmicron_tune_chipset    -       set controller timings
- *     @drive: Drive to set up
- *     @speed: speed we want to achieve
+ *     jmicron_set_dma_mode    -       set host controller for DMA mode
+ *     @drive: drive
+ *     @mode: DMA mode
  *
- *     As the JMicron snoops for timings all we actually need to do is
- *     set the transfer mode on the device.
+ *     As the JMicron snoops for timings we don't need to do anything here.
  */
 
-static int jmicron_tune_chipset(ide_drive_t *drive, const u8 speed)
+static void jmicron_set_dma_mode(ide_drive_t *drive, const u8 mode)
 {
-       return ide_config_drive_speed(drive, speed);
-}
-
-/**
- *     jmicron_configure_drive_for_dma -       set up for DMA transfers
- *     @drive: drive we are going to set up
- *
- *     As the JMicron snoops for timings all we actually need to do is
- *     make sure we don't set an invalid mode.
- */
-
-static int jmicron_config_drive_for_dma (ide_drive_t *drive)
-{
-       if (ide_tune_dma(drive))
-               return 0;
-
-       ide_set_max_pio(drive);
-
-       return -1;
 }
 
 /**
@@ -129,31 +108,21 @@ static int jmicron_config_drive_for_dma (ide_drive_t *drive)
 
 static void __devinit init_hwif_jmicron(ide_hwif_t *hwif)
 {
-       hwif->speedproc = &jmicron_tune_chipset;
        hwif->set_pio_mode = &jmicron_set_pio_mode;
+       hwif->set_dma_mode = &jmicron_set_dma_mode;
 
        hwif->drives[0].autotune = 1;
        hwif->drives[1].autotune = 1;
 
-       if (!hwif->dma_base)
-               goto fallback;
+       if (hwif->dma_base == 0)
+               return;
 
        hwif->atapi_dma = 1;
        hwif->ultra_mask = 0x7f;
        hwif->mwdma_mask = 0x07;
 
-       hwif->ide_dma_check = &jmicron_config_drive_for_dma;
-
        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
                hwif->cbl = ata66_jmicron(hwif);
-
-       hwif->autodma = 1;
-       hwif->drives[0].autodma = hwif->autodma;
-       hwif->drives[1].autodma = hwif->autodma;
-       return;
-fallback:
-       hwif->autodma = 0;
-       return;
 }
 
 static ide_pci_device_t jmicron_chipset __devinitdata = {