3 files changed, 9 insertions, 8 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 1ddaa71a8f45..7cb2d86601db 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -655,7 +655,7 @@ static void hwif_release_dev (struct device *dev)
 {
         ide_hwif_t *hwif = container_of(dev, ide_hwif_t, gendev);
 
-        up(&hwif->gendev_rel_sem);
+        complete(&hwif->gendev_rel_comp);
 }
 
 static void hwif_register (ide_hwif_t *hwif)
@@ -1327,7 +1327,7 @@ static void drive_release_dev (struct device *dev)
         drive->queue = NULL;
         spin_unlock_irq(&ide_lock);
 
-        up(&drive->gendev_rel_sem);
+        complete(&drive->gendev_rel_comp);
 }
 
 /*
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index b069b13b75a7..ec5a4cb173b0 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -222,7 +222,7 @@ static void init_hwif_data(ide_hwif_t *hwif, unsigned int index)
         hwif->mwdma_mask = 0x80;        /* disable all mwdma */
         hwif->swdma_mask = 0x80;        /* disable all swdma */
 
-        sema_init(&hwif->gendev_rel_sem, 0);
+        init_completion(&hwif->gendev_rel_comp);
 
         default_hwif_iops(hwif);
         default_hwif_transport(hwif);
@@ -245,7 +245,7 @@ static void init_hwif_data(ide_hwif_t *hwif, unsigned int index)
                 drive->is_flash                 = 0;
                 drive->vdma                     = 0;
                 INIT_LIST_HEAD(&drive->list);
-                sema_init(&drive->gendev_rel_sem, 0);
+                init_completion(&drive->gendev_rel_comp);
         }
 }
 
@@ -602,7 +602,7 @@ void ide_unregister(unsigned int index)
                 }
                 spin_unlock_irq(&ide_lock);
                 device_unregister(&drive->gendev);
-                down(&drive->gendev_rel_sem);
+                wait_for_completion(&drive->gendev_rel_comp);
                 spin_lock_irq(&ide_lock);
         }
         hwif->present = 0;
@@ -662,7 +662,7 @@ void ide_unregister(unsigned int index)
         /* More messed up locking ... */
         spin_unlock_irq(&ide_lock);
         device_unregister(&hwif->gendev);
-        down(&hwif->gendev_rel_sem);
+        wait_for_completion(&hwif->gendev_rel_comp);
 
         /*
          * Remove us from the kernel's knowledge
diff --git a/include/linux/ide.h b/include/linux/ide.h
index ef8d0cbb832f..9a8c05dbe4f3 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -18,6 +18,7 @@
 #include <linux/bio.h>
 #include <linux/device.h>
 #include <linux/pci.h>
+#include <linux/completion.h>
 #include <asm/byteorder.h>
 #include <asm/system.h>
 #include <asm/io.h>
@@ -638,7 +639,7 @@ typedef struct ide_drive_s {
         int             crc_count;      /* crc counter to reduce drive speed */
         struct list_head list;
         struct device   gendev;
-        struct semaphore gendev_rel_sem;        /* to deal with device release() */
+        struct completion gendev_rel_comp;      /* to deal with device release() */
 } ide_drive_t;
 
 #define to_ide_device(dev)container_of(dev, ide_drive_t, gendev)
@@ -794,7 +795,7 @@ typedef struct hwif_s {
         unsigned        sg_mapped  : 1; /* sg_table and sg_nents are ready */
 
         struct device   gendev;
-        struct semaphore gendev_rel_sem; /* To deal with device release() */
+        struct completion gendev_rel_comp; /* To deal with device release() */
 
         void            *hwif_data;     /* extra hwif data */