git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
fc4
/
socal.c
diff --git
a/drivers/fc4/socal.c
b/drivers/fc4/socal.c
index
b2377db
..
a6b1ae2
100644
(file)
--- a/
drivers/fc4/socal.c
+++ b/
drivers/fc4/socal.c
@@
-404,7
+404,7
@@
update_out:
}
}
}
}
-static irqreturn_t socal_intr(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t socal_intr(int irq, void *dev_id)
{
u32 cmd;
unsigned long flags;
{
u32 cmd;
unsigned long flags;
@@
-665,9
+665,8
@@
static inline void socal_init(struct sbus_dev *sdev, int no)
int size, i;
int irq, node;
int size, i;
int irq, node;
- s = k
m
alloc (sizeof (struct socal), GFP_KERNEL);
+ s = k
z
alloc (sizeof (struct socal), GFP_KERNEL);
if (!s) return;
if (!s) return;
- memset (s, 0, sizeof(struct socal));
spin_lock_init(&s->lock);
s->socal_no = no;
spin_lock_init(&s->lock);
s->socal_no = no;
@@
-762,13
+761,13
@@
static inline void socal_init(struct sbus_dev *sdev, int no)
irq = sdev->irqs[0];
irq = sdev->irqs[0];
- if (request_irq (irq, socal_intr,
SA_SHIRQ
, "SOCAL", (void *)s)) {
+ if (request_irq (irq, socal_intr,
IRQF_SHARED
, "SOCAL", (void *)s)) {
socal_printk ("Cannot order irq %d to go\n", irq);
socals = s->next;
return;
}
socal_printk ("Cannot order irq %d to go\n", irq);
socals = s->next;
return;
}
- SOD(("SOCAL uses IRQ %
s\n", __irq_itoa(irq)
))
+ SOD(("SOCAL uses IRQ %
d\n", irq
))
s->port[0].fc.irq = irq;
s->port[1].fc.irq = irq;
s->port[0].fc.irq = irq;
s->port[1].fc.irq = irq;