ide: add IDE_HFLAG_NO_ATAPI_DMA host flag

[linux-2.6-omap-h63xx.git] / drivers / ide / pci / jmicron.c

diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index 582b4cae2b5358ebb2b150e0b2a5ebefbd15df32..d151fbc26370788109ea5a44eb5b77782574093b 100644 (file)
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -99,24 +99,6 @@ static void jmicron_set_dma_mode(ide_drive_t *drive, const u8 mode)
 {
 }
 
-/**
- *     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;
-}
-
 /**
  *     init_hwif_jmicron       -       set up hwif structs
  *     @hwif: interface to set up
@@ -132,25 +114,14 @@ static void __devinit init_hwif_jmicron(ide_hwif_t *hwif)
        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 = {