This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / ide / ide-pnp.c

diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index 40d60dd..c3f0640 100644 (file)
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -19,7 +19,6 @@
 #include <linux/init.h>
 #include <linux/pnp.h>
 #include <linux/ide.h>
-#include <linux/delay.h>
 
 /* Add your devices here :)) */
 struct pnp_device_id idepnp_devices[] = {
@@ -58,11 +57,7 @@ static void idepnp_remove(struct pnp_dev * dev)
 {
        ide_hwif_t *hwif = pnp_get_drvdata(dev);
        if (hwif) {
-               /* FIXME: will want pushing into a helper workqueue */
-               while(ide_unregister_hwif(hwif) < 0) {
-                       removed_hwif_iops(hwif);
-                       msleep(1000);
-               }
+               ide_unregister_hwif(hwif);
        } else
                printk(KERN_ERR "idepnp: Unable to remove device, please report.\n");
 }