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/trm290.c

diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
index 79a03df..b6a1285 100644
--- a/drivers/ide/trm290.c
+++ b/drivers/ide/trm290.c
@@ -144,7 +144,7 @@
 
 static void trm290_prepare_drive (ide_drive_t *drive, unsigned int use_dma)
 {
-	ide_hwif_t *hwif = HWIF(drive);
+	ide_hwif_t *hwif = drive->hwif;
 	u16 reg = 0;
 	unsigned long flags;
 
@@ -222,15 +222,15 @@
 	drive->waiting_for_dma = 0;
 	/* purge DMA mappings */
 	ide_destroy_dmatable(drive);
-	status = inw(HWIF(drive)->dma_base + 2);
+	status = inw(drive->hwif->dma_base + 2);
+
 	return status != 0x00ff;
 }
 
 static int trm290_dma_test_irq(ide_drive_t *drive)
 {
-	u16 status;
+	u16 status = inw(drive->hwif->dma_base + 2);
 
-	status = inw(HWIF(drive)->dma_base + 2);
 	return status == 0x00ff;
 }