Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into...

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

diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index 11f3307385dea9640f45bd0cc0d1579982394c5c..78d27d9ae4303ab6ee1dd4d2860445b80ea69a2d 100644 (file)
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -52,13 +52,9 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
        hw.chipset = ide_generic;
        hw.dev = &ec->dev;
 
-       host = ide_host_alloc(&rapide_port_info, hws);
-       if (host == NULL) {
-               ret = -ENOENT;
+       ret = ide_host_add(&rapide_port_info, hws, &host);
+       if (ret)
                goto release;
-       }
-
-       ide_host_register(host, &rapide_port_info, hws);
 
        ecard_set_drvdata(ec, host);
        goto out;
@@ -99,7 +95,13 @@ static int __init rapide_init(void)
        return ecard_register_driver(&rapide_driver);
 }
 
+static void __exit rapide_exit(void)
+{
+       ecard_unregister_driver(&rapide_driver);
+}
+
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Yellowstone RAPIDE driver");
 
 module_init(rapide_init);
+module_exit(rapide_exit);