Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c67c216d authored Oct 13, 2008 by Bartlomiej Zolnierkiewicz

ide: remove superfluous ->waiting_for_dma checks



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

parent e4634d4e

drivers/ide/ide-dma.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -578,9 +578,7 @@ int ide_dma_test_irq(ide_drive_t *drive)
	/* return 1 if INTR asserted */		/* return 1 if INTR asserted */
	if ((dma_stat & 4) == 4)		if ((dma_stat & 4) == 4)
	return 1;		return 1;
	if (!drive->waiting_for_dma)
	printk(KERN_WARNING "%s: (%s) called while not waiting\n",
	drive->name, __func__);
	return 0;		return 0;
	}		}
	EXPORT_SYMBOL_GPL(ide_dma_test_irq);		EXPORT_SYMBOL_GPL(ide_dma_test_irq);

drivers/ide/mips/au1xxx-ide.c

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -323,10 +323,6 @@ static int auide_dma_setup(ide_drive_t *drive)

	static int auide_dma_test_irq(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		/* If dbdma didn't execute the STOP command yet, the
	* active bit is still set		* active bit is still set
	*/		*/

drivers/ide/pci/hpt366.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -863,9 +863,6 @@ static int hpt374_dma_test_irq(ide_drive_t *drive)
	if (dma_stat & 4)		if (dma_stat & 4)
	return 1;		return 1;

	if (!drive->waiting_for_dma)
	printk(KERN_WARNING "%s: (%s) called while not waiting\n",
	drive->name, __func__);
	return 0;		return 0;
	}		}

drivers/ide/pci/scc_pata.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -509,9 +509,6 @@ static int scc_dma_test_irq(ide_drive_t *drive)
	if (int_stat & INTSTS_IOIRQS)		if (int_stat & INTSTS_IOIRQS)
	return 1;		return 1;

	if (!drive->waiting_for_dma)
	printk(KERN_WARNING "%s: (%s) called while not waiting\n",
	drive->name, __func__);
	return 0;		return 0;
	}		}

drivers/ide/ppc/pmac.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1672,9 +1672,6 @@ pmac_ide_dma_test_irq (ide_drive_t *drive)
	status = readl(&dma->status);		status = readl(&dma->status);
	if (!(status & ACTIVE))		if (!(status & ACTIVE))
	return 1;		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		/* If dbdma didn't execute the STOP command yet, the
	* active bit is still set. We consider that we aren't		* active bit is still set. We consider that we aren't