commit 898ec223fea2a2df88035e58dbf50f493577e225
author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Tue Jan 06 17:20:52 2009 +0100
committer Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Tue Jan 06 17:20:52 2009 +0100
tree 93e6a4b6a4f518f15743786751cd39b9715f5558
parent b40d1b88f1001f0224c63fa2c008914514bcef33

ide: remove HWIF() macro

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

drivers/ide/pmac.c

diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c
index 899b96b..ee52a21 100644
--- a/drivers/ide/pmac.c
+++ b/drivers/ide/pmac.c
@@ -1513,7 +1513,7 @@
 static int
 pmac_ide_dma_setup(ide_drive_t *drive)
 {
-	ide_hwif_t *hwif = HWIF(drive);
+	ide_hwif_t *hwif = drive->hwif;
 	pmac_ide_hwif_t *pmif =
 		(pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
 	struct request *rq = hwif->rq;
@@ -1637,7 +1637,7 @@
 			break;
 		if (++timeout > 100) {
 			printk(KERN_WARNING "ide%d, ide_dma_test_irq \
-			timeout flushing channel\n", HWIF(drive)->index);
+			timeout flushing channel\n", hwif->index);
 			break;
 		}
 	}