mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-18 06:50:08 +00:00
ide: remove superfluous ->waiting_for_dma checks
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
e4634d4ef0
commit
c67c216d81
@ -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);
|
||||
|
@ -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
|
||||
*/
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user