ide: add IDE_HFLAG_NO_ATAPI_DMA host flag

Add IDE_HFLAG_NO_ATAPI_DMA host flag and set it in host drivers which
don't support ATAPI DMA.  Then remove no longer needed hwif->atapi_dma.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

38 files changed, 38 insertions, 57 deletions

diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index e4875cef78bb..3af33fbf1f88 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -415,7 +415,6 @@ static void icside_dma_lost_irq(ide_drive_t *drive)
 
 static void icside_dma_init(ide_hwif_t *hwif)
 {
-        hwif->atapi_dma         = 1;
         hwif->mwdma_mask        = 7; /* MW0..2 */
         hwif->swdma_mask        = 7; /* SW0..2 */
 
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index 06c75f18eb88..9a96a10ba9d3 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -805,6 +805,7 @@ init_e100_ide (void)
                 hwif->dma_host_on = &cris_dma_on;
                 hwif->dma_off_quietly = &cris_dma_off;
                 hwif->cbl = ATA_CBL_PATA40;
+                hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
                 hwif->pio_mask = ATA_PIO4,
                 hwif->drives[0].autotune = 1;
                 hwif->drives[1].autotune = 1;
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index bc57ce6bf0b3..80b4f17f3941 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -338,8 +338,10 @@ static int config_drive_for_dma (ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         struct hd_driveid *id = drive->id;
 
-        if (drive->media != ide_disk && hwif->atapi_dma == 0)
-                return 0;
+        if (drive->media != ide_disk) {
+                if (hwif->host_flags & IDE_HFLAG_NO_ATAPI_DMA)
+                        return -1;
+        }
 
         /*
          * Enable DMA on any drive that has
@@ -726,8 +728,10 @@ u8 ide_find_dma_mode(ide_drive_t *drive, u8 req_mode)
         int x, i;
         u8 mode = 0;
 
-        if (drive->media != ide_disk && hwif->atapi_dma == 0)
-                return 0;
+        if (drive->media != ide_disk) {
+                if (hwif->host_flags & IDE_HFLAG_NO_ATAPI_DMA)
+                        return 0;
+        }
 
         for (i = 0; i < ARRAY_SIZE(xfer_mode_bases); i++) {
                 if (req_mode < xfer_mode_bases[i])
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 5b090662683e..f78943f86314 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;
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 47c035a550e3..2f322d7e881b 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -699,9 +699,6 @@ static int au_ide_probe(struct device *dev)
         hwif->dma_host_on               = &auide_dma_host_on;
         hwif->dma_lost_irq              = &auide_dma_lost_irq;
         hwif->ide_dma_on                = &auide_dma_on;
-
-        hwif->atapi_dma                 = 1;
-
 #else /* !CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */
         hwif->channel                   = 0;
         hwif->hold                      = 1;
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 3a4c2c26a77e..7bf922fc7a07 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -247,6 +247,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                 .bootable       = OFF_BOARD,
+                .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
                 .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x07, /* udma0-2 */
         },{     /* 1 */
@@ -256,6 +257,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_aec62xx,
                 .autodma        = NOAUTODMA,
                 .bootable       = OFF_BOARD,
+                .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
                 .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x1f, /* udma0-4 */
         },{     /* 2 */
@@ -266,6 +268,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                 .bootable       = NEVER_BOARD,
+                .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
                 .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x1f, /* udma0-4 */
         },{     /* 3 */
@@ -275,6 +278,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_aec62xx,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
+                .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
                 .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x3f, /* udma0-5 */
         },{     /* 4 */
@@ -285,6 +289,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                 .bootable       = OFF_BOARD,
+                .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
                 .pio_mask       = ATA_PIO4,
                 .udma_mask      = 0x3f, /* udma0-5 */
         }
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 31d4e50647d5..6f8ebc959d85 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -677,8 +677,8 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif)
          * check in ->init_dma guarantees m5229_revision >= 0x20 here
          */
 
-        if (m5229_revision > 0x20)
-                hwif->atapi_dma = 1;
+        if (m5229_revision == 0x20)
+                hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
 
         if (m5229_revision <= 0x20)
                 hwif->ultra_mask = 0x00; /* no udma */
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 3bf3d931eea1..9e9e2b6ef6cb 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -260,8 +260,6 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
         if (!hwif->dma_base)
                 return;
 
-        hwif->atapi_dma = 1;
-
         hwif->ultra_mask = amd_config->udma_mask;
         hwif->mwdma_mask = 0x07;
         if ((amd_config->flags & AMD_BAD_SWDMA) == 0)
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 446900da1329..9bb1b93325c6 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -183,7 +183,6 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
         if (!hwif->dma_base)
                 return;
 
-        hwif->atapi_dma = 1;
         hwif->ultra_mask = 0x3f;
         hwif->mwdma_mask = 0x07;
 
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index f3d3bde8daba..bd9adfbe982e 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -517,7 +517,6 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
         if (!hwif->dma_base)
                 return;
 
-        hwif->atapi_dma  = 1;
         hwif->mwdma_mask = 0x07;
         hwif->ultra_mask = hwif->cds->udma_mask;
 
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index a8bf4940ca9c..b7906a980120 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -125,6 +125,7 @@ static void __devinit cs5520_init_setup_dma(struct pci_dev *dev, ide_pci_device_
  
 static int cs5520_dma_on(ide_drive_t *drive)
 {
+        /* ATAPI is harder so leave it for now */
         drive->vdma = 1;
         return 0;
 }
@@ -141,8 +142,6 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif)
 
         hwif->ide_dma_on = &cs5520_dma_on;
 
-        /* ATAPI is harder so leave it for now */
-        hwif->atapi_dma = 0;
         hwif->ultra_mask = 0;
         hwif->swdma_mask = 0;
         hwif->mwdma_mask = 0;
@@ -156,7 +155,8 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif)
                 .autodma        = AUTODMA,                      \
                 .bootable       = ON_BOARD,                     \
                 .host_flags     = IDE_HFLAG_ISA_PORTS |         \
-                                  IDE_HFLAG_VDMA,               \
+                                  IDE_HFLAG_VDMA |              \
+                                  IDE_HFLAG_NO_ATAPI_DMA,       \
                 .pio_mask       = ATA_PIO4,                     \
         }
 
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index 0d23b8aabe9c..2ca5bb280a8a 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -264,7 +264,6 @@ static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif)
         if (hwif->dma_base == 0)
                 return;
 
-        hwif->atapi_dma = 1;
         hwif->ultra_mask = 0x07;
         hwif->mwdma_mask = 0x07;
 
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index c141b7306179..45dc9a1b65a4 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -185,7 +185,6 @@ static void __devinit init_hwif_cs5535(ide_hwif_t *hwif)
         if (hwif->dma_base == 0)
                 return;
 
-        hwif->atapi_dma = 1;
         hwif->ultra_mask = 0x1F;
         hwif->mwdma_mask = 0x07;
 
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index c498ecfd7fcb..c1e672f03244 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -437,7 +437,6 @@ static void __devinit init_hwif_cy82c693(ide_hwif_t *hwif)
                 return;
         }
 
-        hwif->atapi_dma = 1;
         hwif->mwdma_mask = 0x04;
         hwif->swdma_mask = 0x04;
 
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index d543abc26c71..dcee8278141e 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -69,7 +69,6 @@ static void __devinit init_hwif_generic (ide_hwif_t *hwif)
         if (!(hwif->dma_base))
                 return;
 
-        hwif->atapi_dma = 1;
         hwif->ultra_mask = 0x7f;
         hwif->mwdma_mask = 0x07;
         hwif->swdma_mask = 0x07;
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 44ac0e2f7a09..9709681dff6f 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -155,6 +155,7 @@ static ide_pci_device_t hpt34x_chipset __devinitdata = {
         .autodma        = NOAUTODMA,
         .bootable       = NEVER_BOARD,
         .extra          = 16,
+        .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
         .pio_mask       = ATA_PIO5,
 };
 
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index fcb21ddab2cc..5d96a086bde4 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1555,6 +1555,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
+                .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
                 .pio_mask       = ATA_PIO4,
         },{     /* 1 */
                 .name           = "HPT372A",
@@ -1567,6 +1568,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .udma_mask      = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
+                .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
                 .pio_mask       = ATA_PIO4,
         },{     /* 2 */
                 .name           = "HPT302",
@@ -1579,6 +1581,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .udma_mask      = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
+                .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
                 .pio_mask       = ATA_PIO4,
         },{     /* 3 */
                 .name           = "HPT371",
@@ -1591,6 +1594,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .udma_mask      = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
+                .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
                 .pio_mask       = ATA_PIO4,
         },{     /* 4 */
                 .name           = "HPT374",
@@ -1603,6 +1607,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .udma_mask      = ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
+                .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
                 .pio_mask       = ATA_PIO4,
         },{     /* 5 */
                 .name           = "HPT372N",
@@ -1615,6 +1620,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .udma_mask      = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
+                .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
                 .pio_mask       = ATA_PIO4,
         }
 };
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index 24a71d03744a..b52bca7b497a 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -176,7 +176,6 @@ static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
         if (!hwif->dma_base)
                 return;
 
-        hwif->atapi_dma = 1;
         hwif->ultra_mask = 0x7f;
         hwif->mwdma_mask = 0x06;
         hwif->swdma_mask = 0x04;
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index f3391a8698ac..1b1286baa8e0 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -544,12 +544,10 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
 
         ide_set_hwifdata(hwif, idev);
 
-        hwif->atapi_dma = 1;
-
         pci_read_config_byte(hwif->pci_dev, 0x50, &conf);
-        if(conf & 1) {
+        if (conf & 1) {
                 idev->smart = 1;
-                hwif->atapi_dma = 0;
+                hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
                 /* Long I/O's although allowed in LBA48 space cause the
                    onboard firmware to enter the twighlight zone */
                 hwif->rqsize = 256;
@@ -570,10 +568,10 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
          */
 
         pci_read_config_byte(hwif->pci_dev, 0x08, &conf);
-        if(conf == 0x10) {
+        if (conf == 0x10) {
                 idev->timing10 = 1;
-                hwif->atapi_dma = 0;
-                if(!idev->smart)
+                hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
+                if (idev->smart == 0)
                         printk(KERN_WARNING "it821x: Revision 0x10, workarounds activated.\n");
         }
 
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index bb893ffcc987..d151fbc26370 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -117,7 +117,6 @@ static void __devinit init_hwif_jmicron(ide_hwif_t *hwif)
         if (hwif->dma_base == 0)
                 return;
 
-        hwif->atapi_dma = 1;
         hwif->ultra_mask = 0x7f;
         hwif->mwdma_mask = 0x07;
 
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index a8cd50ab62fb..2d5dd983bfe3 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -268,7 +268,8 @@ static ide_pci_device_t ns87415_chipset __devinitdata = {
         .init_hwif      = init_hwif_ns87415,
         .autodma        = AUTODMA,
         .bootable       = ON_BOARD,
-        .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA,
+        .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
+                          IDE_HFLAG_NO_ATAPI_DMA,
 };
 
 static int __devinit ns87415_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 250662ea18ad..2437aed73f35 100644
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -336,7 +336,6 @@ static void __devinit init_hwif_opti621 (ide_hwif_t *hwif)
         if (!(hwif->dma_base))
                 return;
 
-        hwif->atapi_dma = 1;
         hwif->mwdma_mask = 0x07;
         hwif->swdma_mask = 0x07;
 }
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 8704b6f33312..2238df9b8372 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -482,8 +482,6 @@ static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif)
         if (hwif->dma_base == 0)
                 return;
 
-        hwif->atapi_dma  = 1;
-
         hwif->ultra_mask = hwif->cds->udma_mask;
         hwif->mwdma_mask = 0x07;
 
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index e1d2337a9f1d..903bf715fab3 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -330,7 +330,6 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
         hwif->ultra_mask = hwif->cds->udma_mask;
         hwif->mwdma_mask = 0x07;
         hwif->swdma_mask = 0x07;
-        hwif->atapi_dma = 1;
 
         hwif->dma_lost_irq = &pdc202xx_dma_lost_irq;
         hwif->dma_timeout = &pdc202xx_dma_timeout;
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index a8dd0c0add35..3694db62f257 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -397,8 +397,6 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif)
         if (piix_is_ichx(hwif->pci_dev))
                 hwif->ide_dma_clear_irq = &piix_dma_clear_irq;
 
-        hwif->atapi_dma = 1;
-
         hwif->ultra_mask = hwif->cds->udma_mask;
         hwif->mwdma_mask = 0x06;
         hwif->swdma_mask = 0x04;
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 54c5c98a2e26..0ba9d2408575 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -377,7 +377,6 @@ static void __devinit init_hwif_sc1200 (ide_hwif_t *hwif)
         hwif->udma_filter = sc1200_udma_filter;
         hwif->ide_dma_end   = &sc1200_ide_dma_end;
 
-        hwif->atapi_dma = 1;
         hwif->ultra_mask = 0x07;
         hwif->mwdma_mask = 0x07;
 }
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index bd4c1d3070e4..ac519fa62153 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -693,7 +693,6 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif)
         }
         hwif->mwdma_mask = 0x00;
         hwif->swdma_mask = 0x00;
-        hwif->atapi_dma = 1;
 
         /* we support 80c cable only. */
         hwif->cbl = ATA_CBL_PATA80;
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index d3ffc52e22af..40b89a29014f 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -367,8 +367,6 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
         hwif->set_dma_mode = &svwks_set_dma_mode;
         hwif->udma_filter = &svwks_udma_filter;
 
-        hwif->atapi_dma = 1;
-
         if (hwif->pci_dev->device != PCI_DEVICE_ID_SERVERWORKS_OSB4IDE)
                 hwif->ultra_mask = 0x3f;
 
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 9a9474f534e5..9122cb71bcc9 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -592,7 +592,6 @@ ide_init_sgiioc4(ide_hwif_t * hwif)
         if (hwif->dma_base == 0)
                 return;
 
-        hwif->atapi_dma = 1;
         hwif->mwdma_mask = 0x04;
 
         hwif->dma_setup = &sgiioc4_ide_dma_setup;
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 5ca14ae46c9d..4c8108345d83 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -899,8 +899,8 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
         hwif->ultra_mask = 0x7f;
         hwif->mwdma_mask = 0x07;
 
-        if (!is_sata(hwif))
-                hwif->atapi_dma = 1;
+        if (is_sata(hwif))
+                hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
 
         if (hwif->cbl != ATA_CBL_PATA40_SHORT)
                 hwif->cbl = ata66_siimage(hwif);
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 5a54e2e20b3c..f756c7f83b5d 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -579,8 +579,6 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif)
         if (hwif->dma_base == 0)
                 return;
 
-        hwif->atapi_dma = 1;
-
         hwif->ultra_mask = udma_rates[chipset_family];
         hwif->mwdma_mask = 0x07;
 
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 771efb8884c8..e78448148aca 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -388,7 +388,6 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
                 return;
         }
 
-        hwif->atapi_dma  = 1;
         hwif->mwdma_mask = 0x07;
 
         hwif->ide_dma_on                = &sl82c105_ide_dma_on;
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index fa8df6d43832..d0447219752d 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -147,7 +147,6 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
         if (hwif->dma_base == 0)
                 return;
 
-        hwif->atapi_dma = 1;
         hwif->ultra_mask = 0x1f;
         hwif->mwdma_mask = 0x06;
         hwif->swdma_mask = 0x04;
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index de62db576adc..0e3a8fe2037d 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -198,7 +198,6 @@ static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif)
         /* Sector Count Register limit */
         hwif->rqsize     = 0xffff;
 
-        hwif->atapi_dma  = 1;
         hwif->ultra_mask = 0x1f;
         hwif->mwdma_mask = 0x07;
 
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index 4075c907f05c..68e1e9adf84d 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -104,7 +104,6 @@ static void __devinit init_hwif_triflex(ide_hwif_t *hwif)
         if (hwif->dma_base == 0)
                 return;
 
-        hwif->atapi_dma  = 1;
         hwif->mwdma_mask = 0x07;
         hwif->swdma_mask = 0x07;
 }
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index e3d943ada7b0..1307454f9c15 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -327,7 +327,9 @@ static ide_pci_device_t trm290_chipset __devinitdata = {
         .autodma        = NOAUTODMA,
         .bootable       = ON_BOARD,
 #if 0 /* play it safe for now */
-        .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA,
+        .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA | IDE_HFLAG_NO_ATAPI_DMA,
+#else
+        .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
 #endif
 };
 
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index b25fb65b240e..648432f4c79e 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -443,8 +443,6 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
         if (!hwif->dma_base)
                 return;
 
-        hwif->atapi_dma = 1;
-
         hwif->ultra_mask = vdev->via_config->udma_mask;
         hwif->mwdma_mask = 0x07;
         hwif->swdma_mask = 0x07;
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 1d25a3433008..c55479356768 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1780,7 +1780,6 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
         hwif->dma_timeout = &ide_dma_timeout;
         hwif->dma_lost_irq = &pmac_ide_dma_lost_irq;
 
-        hwif->atapi_dma = 1;
         switch(pmif->kind) {
                 case controller_sh_ata6:
                         hwif->ultra_mask = pmif->cable_80 ? 0x7f : 0x07;