ide: remove superfluous ->waiting_for_dma checks

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

5 files changed, 2 insertions, 17 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 1185f5a4c154..82fa6107434b 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -578,9 +578,7 @@ int ide_dma_test_irq(ide_drive_t *drive)
         /* return 1 if INTR asserted */
         if ((dma_stat & 4) == 4)
                 return 1;
-        if (!drive->waiting_for_dma)
-                printk(KERN_WARNING "%s: (%s) called while not waiting\n",
-                        drive->name, __func__);
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(ide_dma_test_irq);
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 11b7f61aae40..1c95a0ed7504 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -322,11 +322,7 @@ static int auide_dma_setup(ide_drive_t *drive)
 }
 
 static int auide_dma_test_irq(ide_drive_t *drive)
-{       
-        if (drive->waiting_for_dma == 0)
-                printk(KERN_WARNING "%s: ide_dma_test_irq \
-                                     called while not waiting\n", drive->name);
-
+{
         /* If dbdma didn't execute the STOP command yet, the
          * active bit is still set
          */
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index a194022b6a61..5d47916dab99 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -863,9 +863,6 @@ static int hpt374_dma_test_irq(ide_drive_t *drive)
         if (dma_stat & 4)
                 return 1;
 
-        if (!drive->waiting_for_dma)
-                printk(KERN_WARNING "%s: (%s) called while not waiting\n",
-                                drive->name, __func__);
         return 0;
 }
 
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 9105a39398e2..62fa31409a33 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -509,9 +509,6 @@ static int scc_dma_test_irq(ide_drive_t *drive)
         if (int_stat & INTSTS_IOIRQS)
                 return 1;
 
-        if (!drive->waiting_for_dma)
-                printk(KERN_WARNING "%s: (%s) called while not waiting\n",
-                        drive->name, __func__);
         return 0;
 }
 
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 0a6d40cebe47..2de22b6fe3bd 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1672,9 +1672,6 @@ pmac_ide_dma_test_irq (ide_drive_t *drive)
         status = readl(&dma->status);
         if (!(status & ACTIVE))
                 return 1;
-        if (!drive->waiting_for_dma)
-                printk(KERN_WARNING "ide%d, ide_dma_test_irq \
-                        called while not waiting\n", HWIF(drive)->index);
 
         /* If dbdma didn't execute the STOP command yet, the
          * active bit is still set. We consider that we aren't