1 files changed, 15 insertions, 42 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 5fe85191d49c..ead141e2db9e 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -119,15 +119,17 @@ static const struct drive_list_entry drive_blacklist [] = {
         { "HITACHI CDR-8335"    ,       "ALL"           },
         { "HITACHI CDR-8435"    ,       "ALL"           },
         { "Toshiba CD-ROM XM-6202B"     ,       "ALL"           },
+        { "TOSHIBA CD-ROM XM-1702BC",   "ALL"           },
         { "CD-532E-A"           ,       "ALL"           },
         { "E-IDE CD-ROM CR-840",        "ALL"           },
         { "CD-ROM Drive/F5A",   "ALL"           },
         { "WPI CDD-820",                "ALL"           },
         { "SAMSUNG CD-ROM SC-148C",     "ALL"           },
         { "SAMSUNG CD-ROM SC",  "ALL"           },
-        { "SanDisk SDP3B-64"    ,       "ALL"           },
         { "ATAPI CD-ROM DRIVE 40X MAXIMUM",     "ALL"           },
         { "_NEC DV5800A",               "ALL"           },  
+        { "SAMSUNG CD-ROM SN-124",      "N001" },
+        { "Seagate STT20000A",          "ALL" },
         { NULL                  ,       NULL            }
 
 };
@@ -670,41 +672,6 @@ int __ide_dma_good_drive (ide_drive_t *drive)
 
 EXPORT_SYMBOL(__ide_dma_good_drive);
 
-int ide_use_dma(ide_drive_t *drive)
-{
-        struct hd_driveid *id = drive->id;
-        ide_hwif_t *hwif = drive->hwif;
-
-        if ((id->capability & 1) == 0 || drive->autodma == 0)
-                return 0;
-
-        /* consult the list of known "bad" drives */
-        if (__ide_dma_bad_drive(drive))
-                return 0;
-
-        /* capable of UltraDMA modes */
-        if (id->field_valid & 4) {
-                if (hwif->ultra_mask & id->dma_ultra)
-                        return 1;
-        }
-
-        /* capable of regular DMA modes */
-        if (id->field_valid & 2) {
-                if (hwif->mwdma_mask & id->dma_mword)
-                        return 1;
-                if (hwif->swdma_mask & id->dma_1word)
-                        return 1;
-        }
-
-        /* consult the list of known "good" drives */
-        if (__ide_dma_good_drive(drive) && id->eide_dma_time < 150)
-                return 1;
-
-        return 0;
-}
-
-EXPORT_SYMBOL_GPL(ide_use_dma);
-
 static const u8 xfer_mode_bases[] = {
         XFER_UDMA_0,
         XFER_MW_DMA_0,
@@ -731,10 +698,12 @@ static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base)
                         mask &= 0x07;
                 break;
         case XFER_MW_DMA_0:
-                mask = id->dma_mword & hwif->mwdma_mask;
+                if (id->field_valid & 2)
+                        mask = id->dma_mword & hwif->mwdma_mask;
                 break;
         case XFER_SW_DMA_0:
-                mask = id->dma_1word & hwif->swdma_mask;
+                if (id->field_valid & 2)
+                        mask = id->dma_1word & hwif->swdma_mask;
                 break;
         default:
                 BUG();
@@ -783,8 +752,11 @@ int ide_tune_dma(ide_drive_t *drive)
 {
         u8 speed;
 
-        /* TODO: use only ide_max_dma_mode() */
-        if (!ide_use_dma(drive))
+        if ((drive->id->capability & 1) == 0 || drive->autodma == 0)
+                return 0;
+
+        /* consult the list of known "bad" drives */
+        if (__ide_dma_bad_drive(drive))
                 return 0;
 
         speed = ide_max_dma_mode(drive);
@@ -792,9 +764,10 @@ int ide_tune_dma(ide_drive_t *drive)
         if (!speed)
                 return 0;
 
-        drive->hwif->speedproc(drive, speed);
+        if (drive->hwif->speedproc(drive, speed))
+                return 0;
 
-        return ide_dma_enable(drive);
+        return 1;
 }
 
 EXPORT_SYMBOL_GPL(ide_tune_dma);