From f79fe7c318269870b0221a4431c3f9c7fc752e91 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 9 Jan 2006 15:59:26 -0800 Subject: [PATCH] --- yaml --- r: 17475 b: refs/heads/master c: 906c3b75f6c09b4693a20387aaa6aaa50d327082 h: refs/heads/master i: 17473: 37442850cd79255efccf85f0552df79618a46123 17471: c8f5f37877c96ee55def1dccfc847d236abc4480 v: v3 --- [refs] | 2 +- trunk/drivers/block/sx8.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index fd3c3f4f24c5..ead176449306 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7892f2f48d165a34b0b8130c8a195dfd807b8cb6 +refs/heads/master: 906c3b75f6c09b4693a20387aaa6aaa50d327082 diff --git a/trunk/drivers/block/sx8.c b/trunk/drivers/block/sx8.c index c0cdc182a8b0..4bdf95716e2b 100644 --- a/trunk/drivers/block/sx8.c +++ b/trunk/drivers/block/sx8.c @@ -27,8 +27,8 @@ #include #include #include +#include #include -#include #include #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,