projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[S390] Convert memory detection into C code.
[powerpc.git]
/
drivers
/
block
/
sx8.c
diff --git
a/drivers/block/sx8.c
b/drivers/block/sx8.c
index
c6beee1
..
54509eb
100644
(file)
--- a/
drivers/block/sx8.c
+++ b/
drivers/block/sx8.c
@@
-1200,7
+1200,7
@@
static inline void carm_handle_responses(struct carm_host *host)
host->resp_idx += work;
}
host->resp_idx += work;
}
-static irqreturn_t carm_interrupt(int irq, void *__host
, struct pt_regs *regs
)
+static irqreturn_t carm_interrupt(int irq, void *__host)
{
struct carm_host *host = __host;
void __iomem *mmio;
{
struct carm_host *host = __host;
void __iomem *mmio;
@@
-1244,9
+1244,10
@@
out:
return IRQ_RETVAL(handled);
}
return IRQ_RETVAL(handled);
}
-static void carm_fsm_task (
void *_data
)
+static void carm_fsm_task (
struct work_struct *work
)
{
{
- struct carm_host *host = _data;
+ struct carm_host *host =
+ container_of(work, struct carm_host, fsm_task);
unsigned long flags;
unsigned int state;
int rc, i, next_dev;
unsigned long flags;
unsigned int state;
int rc, i, next_dev;
@@
-1619,7
+1620,7
@@
static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
host->pdev = pdev;
host->flags = pci_dac ? FL_DAC : 0;
spin_lock_init(&host->lock);
host->pdev = pdev;
host->flags = pci_dac ? FL_DAC : 0;
spin_lock_init(&host->lock);
- INIT_WORK(&host->fsm_task, carm_fsm_task
, host
);
+ INIT_WORK(&host->fsm_task, carm_fsm_task);
init_completion(&host->probe_comp);
for (i = 0; i < ARRAY_SIZE(host->req); i++)
init_completion(&host->probe_comp);
for (i = 0; i < ARRAY_SIZE(host->req); i++)