kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] mutex subsystem, semaphore to completion: SX8

Browse source 
change SX8 semaphores to completions.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Steven Rostedt 2006-01-09 15:59:26 -08:00 committed by Ingo Molnar
parent 7892f2f48d
commit 906c3b75f6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/block/sx8.c
View file

@ -27,8 +27,8 @@
#include <linux/time.h> #include <linux/time.h>
#include <linux/hdreg.h> #include <linux/hdreg.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/completion.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/semaphore.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#if 0 #if 0
@ -303,7 +303,7 @@ struct carm_host {
struct work_struct fsm_task; struct work_struct fsm_task;
struct semaphore probe_sem; struct completion probe_comp;
}; };
struct carm_response { struct carm_response {
@ -1346,7 +1346,7 @@ static void carm_fsm_task (void *_data)
} }
case HST_PROBE_FINISHED: case HST_PROBE_FINISHED:
up(&host->probe_sem); complete(&host->probe_comp);
break; break;
case HST_ERROR: 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; host->flags = pci_dac ? FL_DAC : 0;
spin_lock_init(&host->lock); spin_lock_init(&host->lock);
INIT_WORK(&host->fsm_task, carm_fsm_task, host); 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++) for (i = 0; i < ARRAY_SIZE(host->req); i++)
host->req[i].tag = 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) if (rc)
goto err_out_free_irq; goto err_out_free_irq;
DPRINTK("waiting for probe_sem\n"); DPRINTK("waiting for probe_comp\n");
down(&host->probe_sem); wait_for_completion(&host->probe_comp);
printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n", printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n",
host->name, pci_name(pdev), (int) CARM_MAX_PORTS, host->name, pci_name(pdev), (int) CARM_MAX_PORTS,