Skip to content

Commit

Permalink
[PATCH] mutex subsystem, semaphore to completion: SX8
Browse files Browse the repository at this point in the history
change SX8 semaphores to completions.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Steven Rostedt authored and Ingo Molnar committed Jan 9, 2006
1 parent 7892f2f commit 906c3b7
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/block/sx8.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -303,7 +303,7 @@ struct carm_host {

struct work_struct fsm_task;

struct semaphore probe_sem;
struct completion probe_comp;
};

struct carm_response {
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 906c3b7

Please sign in to comment.