diff options
-rw-r--r-- | drivers/ide/ide-dma.c | 4 | ||||
-rw-r--r-- | drivers/ide/mips/au1xxx-ide.c | 6 | ||||
-rw-r--r-- | drivers/ide/pci/hpt366.c | 3 | ||||
-rw-r--r-- | drivers/ide/pci/scc_pata.c | 3 | ||||
-rw-r--r-- | drivers/ide/ppc/pmac.c | 3 |
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) | |||
578 | /* return 1 if INTR asserted */ | 578 | /* return 1 if INTR asserted */ |
579 | if ((dma_stat & 4) == 4) | 579 | if ((dma_stat & 4) == 4) |
580 | return 1; | 580 | return 1; |
581 | if (!drive->waiting_for_dma) | 581 | |
582 | printk(KERN_WARNING "%s: (%s) called while not waiting\n", | ||
583 | drive->name, __func__); | ||
584 | return 0; | 582 | return 0; |
585 | } | 583 | } |
586 | EXPORT_SYMBOL_GPL(ide_dma_test_irq); | 584 | 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) | |||
322 | } | 322 | } |
323 | 323 | ||
324 | static int auide_dma_test_irq(ide_drive_t *drive) | 324 | static int auide_dma_test_irq(ide_drive_t *drive) |
325 | { | 325 | { |
326 | if (drive->waiting_for_dma == 0) | ||
327 | printk(KERN_WARNING "%s: ide_dma_test_irq \ | ||
328 | called while not waiting\n", drive->name); | ||
329 | |||
330 | /* If dbdma didn't execute the STOP command yet, the | 326 | /* If dbdma didn't execute the STOP command yet, the |
331 | * active bit is still set | 327 | * active bit is still set |
332 | */ | 328 | */ |
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) | |||
863 | if (dma_stat & 4) | 863 | if (dma_stat & 4) |
864 | return 1; | 864 | return 1; |
865 | 865 | ||
866 | if (!drive->waiting_for_dma) | ||
867 | printk(KERN_WARNING "%s: (%s) called while not waiting\n", | ||
868 | drive->name, __func__); | ||
869 | return 0; | 866 | return 0; |
870 | } | 867 | } |
871 | 868 | ||
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) | |||
509 | if (int_stat & INTSTS_IOIRQS) | 509 | if (int_stat & INTSTS_IOIRQS) |
510 | return 1; | 510 | return 1; |
511 | 511 | ||
512 | if (!drive->waiting_for_dma) | ||
513 | printk(KERN_WARNING "%s: (%s) called while not waiting\n", | ||
514 | drive->name, __func__); | ||
515 | return 0; | 512 | return 0; |
516 | } | 513 | } |
517 | 514 | ||
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) | |||
1672 | status = readl(&dma->status); | 1672 | status = readl(&dma->status); |
1673 | if (!(status & ACTIVE)) | 1673 | if (!(status & ACTIVE)) |
1674 | return 1; | 1674 | return 1; |
1675 | if (!drive->waiting_for_dma) | ||
1676 | printk(KERN_WARNING "ide%d, ide_dma_test_irq \ | ||
1677 | called while not waiting\n", HWIF(drive)->index); | ||
1678 | 1675 | ||
1679 | /* If dbdma didn't execute the STOP command yet, the | 1676 | /* If dbdma didn't execute the STOP command yet, the |
1680 | * active bit is still set. We consider that we aren't | 1677 | * active bit is still set. We consider that we aren't |