summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2006-01-09 15:59:26 -0800
committerIngo Molnar <mingo@hera.kernel.org>2006-01-09 15:59:26 -0800
commit906c3b75f6c09b4693a20387aaa6aaa50d327082 (patch)
treec45749fcb6f8f22d9e2666135b528c885856aaed /drivers/block
parent7892f2f48d165a34b0b8130c8a195dfd807b8cb6 (diff)
downloadkernel-crypto-906c3b75f6c09b4693a20387aaa6aaa50d327082.tar.gz
kernel-crypto-906c3b75f6c09b4693a20387aaa6aaa50d327082.tar.xz
kernel-crypto-906c3b75f6c09b4693a20387aaa6aaa50d327082.zip
[PATCH] mutex subsystem, semaphore to completion: SX8
change SX8 semaphores to completions. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/sx8.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index c0cdc182a8b..4bdf95716e2 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -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,