au1xxx-ide/rapide: use hwif->index for ide_unregister()

PATCH In review Bartlomiej Zolnierkiewicz 1 participant 1 message Dec 30, 2007 libata

lore

Share & tools

lore

Bartlomiej Zolnierkiewicz

author

2007-12-30 17:31 UTC #0 lore raw

PATCH 3/3 au1xxx-ide/rapide: use hwif->index for ide_unregister()

Cc Russell King <[email protected]>

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
 drivers/ide/arm/rapide.c      |    4 ++--
 drivers/ide/mips/au1xxx-ide.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

drivers/ide/arm/rapide.c +2 -2

Index: b/drivers/ide/arm/rapide.c
===================================================================
@@ -78,8 +78,8 @@ static void __devexit rapide_remove(stru
 
 	ecard_set_drvdata(ec, NULL);
 
-	/* there must be a better way */
-	ide_unregister(hwif - ide_hwifs);
+	ide_unregister(hwif->index);
+
 	ecard_release_resources(ec);
 }

drivers/ide/mips/au1xxx-ide.c +1 -1

Index: b/drivers/ide/mips/au1xxx-ide.c
===================================================================
@@ -691,7 +691,7 @@ static int au_ide_remove(struct device *
 	ide_hwif_t *hwif = dev_get_drvdata(dev);
 	_auide_hwif *ahwif = &auide_hwif;
 
-	ide_unregister(hwif - ide_hwifs);
+	ide_unregister(hwif->index);
 
 	iounmap((void *)ahwif->regbase);