summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-01 23:09:33 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-01 23:09:33 +0100
commitfadd11c71b5a100fb7560b84a6272b8883082726 (patch)
treeb6fb0fe9df2c7f23481f3b34497d7101a2ef31fe /drivers/ide
parented908fa1d037d780ebd04a412693bf3fc9c3a8fe (diff)
downloadop-kernel-dev-fadd11c71b5a100fb7560b84a6272b8883082726.zip
op-kernel-dev-fadd11c71b5a100fb7560b84a6272b8883082726.tar.gz
au1xxx-ide/rapide: use hwif->index for ide_unregister()
Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/arm/rapide.c4
-rw-r--r--drivers/ide/mips/au1xxx-ide.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index e6b56d1..b5b6ed8 100644
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -78,8 +78,8 @@ static void __devexit rapide_remove(struct expansion_card *ec)
ecard_set_drvdata(ec, NULL);
- /* there must be a better way */
- ide_unregister(hwif - ide_hwifs);
+ ide_unregister(hwif->index);
+
ecard_release_resources(ec);
}
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index b00c71f..71782b3 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -691,7 +691,7 @@ static int au_ide_remove(struct device *dev)
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);
OpenPOWER on IntegriCloud