projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Process Events - Header Cleanup
[powerpc.git]
/
drivers
/
block
/
sx8.c
diff --git
a/drivers/block/sx8.c
b/drivers/block/sx8.c
index
c0cdc18
..
2ae08b3
100644
(file)
--- 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/time.h>
#include <linux/hdreg.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>
#if 0
#include <asm/uaccess.h>
#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;
case HST_ERROR:
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);
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;
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;
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,
printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n",
host->name, pci_name(pdev), (int) CARM_MAX_PORTS,
@@
-1755,7
+1755,7
@@
static void carm_remove_one (struct pci_dev *pdev)
static int __init carm_init(void)
{
static int __init carm_init(void)
{
- return pci_
module_init
(&carm_driver);
+ return pci_
register_driver
(&carm_driver);
}
static void __exit carm_exit(void)
}
static void __exit carm_exit(void)