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

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (67 commits)
  ide: remove redundant DMA blacklist check from __ide_dma_on()
  ide: cleanup ide_set_dma()
  ide: remove redundant ->ide_dma_on call from set_using_dma()
  sc1200: move DMA timings to timing tables
  ide: add IDE_HFLAG_ABUSE_SET_DMA_MODE host flag
  sis5513: factor out UDMA programming code
  pdc202xx_new: move PIO programming code to pdcnew_set_pio_mode()
  ide: make 'extra' field in struct ide_port_info u8
  ide: kill duplicate code in ide_dump_{ata,atapi}_status()
  ide-disk: use ide_get_lba_addr()
  ide: printk fix
  ide: add ide_tf_read() helper
  ide: fix registers loading order in ide_dump_ata_status()
  ide-disk: use do_rw_taskfile() (take 2)
  ide-disk: add ide_tf_set_cmd() helper
  ide-disk: extend timeout for PIO-in commands
  ide: remove 'handler' field from ide_task_t (take 2)
  ide: use ->data_phase to set ->handler in do_rw_taskfile()
  ide: convert do_rw_taskfile() to use ->data_phase
  ide: merge flagged_taskfile() into do_rw_taskfile()
  ...

1 files changed, 11 insertions, 25 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 4703837bf1fc..18c78ad2b31e 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -491,10 +491,6 @@ EXPORT_SYMBOL(ide_dma_host_on);
  
 int __ide_dma_on (ide_drive_t *drive)
 {
-        /* consult the list of known "bad" drives */
-        if (__ide_dma_bad_drive(drive))
-                return 1;
-
         drive->using_dma = 1;
         ide_toggle_bounce(drive, 1);
 
@@ -827,22 +823,19 @@ int ide_set_dma(ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         int rc;
 
-        rc = ide_dma_check(drive);
+        /*
+         * Force DMAing for the beginning of the check.
+         * Some chipsets appear to do interesting
+         * things, if not checked and cleared.
+         *   PARANOIA!!!
+         */
+        hwif->dma_off_quietly(drive);
 
-        switch(rc) {
-        case -1: /* DMA needs to be disabled */
-                hwif->dma_off_quietly(drive);
-                return -1;
-        case  0: /* DMA needs to be enabled */
-                return hwif->ide_dma_on(drive);
-        case  1: /* DMA setting cannot be changed */
-                break;
-        default:
-                BUG();
-                break;
-        }
+        rc = ide_dma_check(drive);
+        if (rc)
+                return rc;
 
-        return rc;
+        return hwif->ide_dma_on(drive);
 }
 
 #ifdef CONFIG_BLK_DEV_IDEDMA_PCI
@@ -968,11 +961,6 @@ void ide_setup_dma(ide_hwif_t *hwif, unsigned long base, unsigned num_ports)
 
         hwif->dma_base = base;
 
-        if (hwif->mate)
-                hwif->dma_master = hwif->channel ? hwif->mate->dma_base : base;
-        else
-                hwif->dma_master = base;
-
         if (!(hwif->dma_command))
                 hwif->dma_command       = hwif->dma_base;
         if (!(hwif->dma_vendor1))
@@ -1014,8 +1002,6 @@ void ide_setup_dma(ide_hwif_t *hwif, unsigned long base, unsigned num_ports)
                        hwif->drives[1].name, (dma_stat & 0x40) ? "DMA" : "pio");
         }
         printk("\n");
-
-        BUG_ON(!hwif->dma_master);
 }
 
 EXPORT_SYMBOL_GPL(ide_setup_dma);