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, 1 insertions, 5 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 54943da6e4e5..c6d4f630e18a 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -424,7 +424,6 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->reset_poll                = tmp_hwif->reset_poll;
         hwif->pre_reset                 = tmp_hwif->pre_reset;
         hwif->resetproc                 = tmp_hwif->resetproc;
-        hwif->intrproc                  = tmp_hwif->intrproc;
         hwif->maskproc                  = tmp_hwif->maskproc;
         hwif->quirkproc                 = tmp_hwif->quirkproc;
         hwif->busproc                   = tmp_hwif->busproc;
@@ -468,7 +467,6 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
 #endif
 
         hwif->dma_base                  = tmp_hwif->dma_base;
-        hwif->dma_master                = tmp_hwif->dma_master;
         hwif->dma_command               = tmp_hwif->dma_command;
         hwif->dma_vendor1               = tmp_hwif->dma_vendor1;
         hwif->dma_status                = tmp_hwif->dma_status;
@@ -602,7 +600,6 @@ void ide_unregister(unsigned int index)
                 (void) ide_release_dma(hwif);
 
                 hwif->dma_base = 0;
-                hwif->dma_master = 0;
                 hwif->dma_command = 0;
                 hwif->dma_vendor1 = 0;
                 hwif->dma_status = 0;
@@ -854,8 +851,7 @@ int set_using_dma(ide_drive_t *drive, int arg)
         err = 0;
 
         if (arg) {
-                hwif->dma_off_quietly(drive);
-                if (ide_set_dma(drive) || hwif->ide_dma_on(drive))
+                if (ide_set_dma(drive))
                         err = -EIO;
         } else
                 ide_dma_off(drive);