ide: add 'init_default' and 'restore' arguments to ide_unregister()

[safe/jmp/linux-2.6] / drivers / ide / arm / rapide.c

diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index 0267467..823d333 100644 (file)
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -1,6 +1,4 @@
 /*
- * linux/drivers/ide/arm/rapide.c
- *
  * Copyright (c) 1996-2002 Russell King.
  */
 
@@ -58,11 +56,9 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
                hwif->mmio = 1;
                default_hwif_mmiops(hwif);
 
-               hwif->hwif_data = base;
-
                idx[0] = hwif->index;
 
-               ide_device_add(idx);
+               ide_device_add(idx, NULL);
 
                ecard_set_drvdata(ec, hwif);
                goto out;
@@ -80,8 +76,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, 1, 1);
+
        ecard_release_resources(ec);
 }