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

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (37 commits)
  ide: set drive->autotune in ide_pci_setup_ports()
  triflex: always tune PIO
  opti621: always tune PIO
  cy82c693: always tune PIO
  cs5520: always tune PIO
  alim15x3: always tune PIO
  ide: add IDE_HFLAG_LEGACY_IRQS host flag
  ide: add IDE_HFLAG_SERIALIZE host flag
  ide: add IDE_HFLAG_ERROR_STOPS_FIFO host flag
  piix: add DECLARE_ICH_DEV() macro
  pdc202xx_old: add DECLARE_PDC2026X_DEV() macro
  pdc202xx_new: add DECLARE_PDCNEW_DEV() macro
  aec62xx: no need to disable UDMA in ->init_hwif method for ATP850UF
  ide: remove .init_setup from ide_pci_device_t
  serverworks: remove ->init_setup
  scc_pata: remove ->init_setup
  pdc202xx_old: remove ->init_setup
  pdc202xx_new: remove ->init_setup
  hpt366: remove ->init_setup
  cmd64x: remove ->init_setup
  ...

1 files changed, 0 insertions, 4 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 5b090662683e..961e6c897286 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -134,8 +134,6 @@ static void init_hwif_data(ide_hwif_t *hwif, unsigned int index)
 
         hwif->bus_state = BUSSTATE_ON;
 
-        hwif->atapi_dma = 0;            /* disable all atapi dma */ 
-
         init_completion(&hwif->gendev_rel_comp);
 
         default_hwif_iops(hwif);
@@ -379,7 +377,6 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
 
         hwif->pio_mask                  = tmp_hwif->pio_mask;
 
-        hwif->atapi_dma                 = tmp_hwif->atapi_dma;
         hwif->ultra_mask                = tmp_hwif->ultra_mask;
         hwif->mwdma_mask                = tmp_hwif->mwdma_mask;
         hwif->swdma_mask                = tmp_hwif->swdma_mask;
@@ -440,7 +437,6 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
 
         hwif->mmio                      = tmp_hwif->mmio;
         hwif->rqsize                    = tmp_hwif->rqsize;
-        hwif->no_lba48                  = tmp_hwif->no_lba48;
 
 #ifndef CONFIG_BLK_DEV_IDECS
         hwif->irq                       = tmp_hwif->irq;