]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - drivers/block/sx8.c
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
[linux-2.6.git] / drivers / block / sx8.c
index a7e0975c8c9f9c1da047b038c38e31250e710abb..2ae08b343b935518c86098959866299e73f213e8 100644 (file)
@@ -27,8 +27,8 @@
 #include <linux/time.h>
 #include <linux/hdreg.h>
 #include <linux/dma-mapping.h>
+#include <linux/completion.h>
 #include <asm/io.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #if 0
@@ -303,7 +303,7 @@ struct carm_host {
 
        struct work_struct              fsm_task;
 
-       struct semaphore                probe_sem;
+       struct completion               probe_comp;
 };
 
 struct carm_response {
@@ -1346,7 +1346,7 @@ static void carm_fsm_task (void *_data)
        }
 
        case HST_PROBE_FINISHED:
-               up(&host->probe_sem);
+               complete(&host->probe_comp);
                break;
 
        case HST_ERROR:
@@ -1622,7 +1622,7 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        host->flags = pci_dac ? FL_DAC : 0;
        spin_lock_init(&host->lock);
        INIT_WORK(&host->fsm_task, carm_fsm_task, host);
-       init_MUTEX_LOCKED(&host->probe_sem);
+       init_completion(&host->probe_comp);
 
        for (i = 0; i < ARRAY_SIZE(host->req); i++)
                host->req[i].tag = i;
@@ -1691,8 +1691,8 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        if (rc)
                goto err_out_free_irq;
 
-       DPRINTK("waiting for probe_sem\n");
-       down(&host->probe_sem);
+       DPRINTK("waiting for probe_comp\n");
+       wait_for_completion(&host->probe_comp);
 
        printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n",
               host->name, pci_name(pdev), (int) CARM_MAX_PORTS,