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
/
input
/
serio
/
rpckbd.c
diff --git
a/drivers/input/serio/rpckbd.c
b/drivers/input/serio/rpckbd.c
index
a3bd115
..
49f8431
100644
(file)
--- a/
drivers/input/serio/rpckbd.c
+++ b/
drivers/input/serio/rpckbd.c
@@
-56,7
+56,7
@@
static int rpckbd_write(struct serio *port, unsigned char val)
return 0;
}
return 0;
}
-static irqreturn_t rpckbd_rx(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t rpckbd_rx(int irq, void *dev_id)
{
struct serio *port = dev_id;
unsigned int byte;
{
struct serio *port = dev_id;
unsigned int byte;
@@
-65,13
+65,13
@@
static irqreturn_t rpckbd_rx(int irq, void *dev_id, struct pt_regs *regs)
while (iomd_readb(IOMD_KCTRL) & (1 << 5)) {
byte = iomd_readb(IOMD_KARTRX);
while (iomd_readb(IOMD_KCTRL) & (1 << 5)) {
byte = iomd_readb(IOMD_KARTRX);
- serio_interrupt(port, byte, 0
, regs
);
+ serio_interrupt(port, byte, 0);
handled = IRQ_HANDLED;
}
return handled;
}
handled = IRQ_HANDLED;
}
return handled;
}
-static irqreturn_t rpckbd_tx(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t rpckbd_tx(int irq, void *dev_id)
{
return IRQ_HANDLED;
}
{
return IRQ_HANDLED;
}
@@
-111,11
+111,10
@@
static int __devinit rpckbd_probe(struct platform_device *dev)
{
struct serio *serio;
{
struct serio *serio;
- serio = k
m
alloc(sizeof(struct serio), GFP_KERNEL);
+ serio = k
z
alloc(sizeof(struct serio), GFP_KERNEL);
if (!serio)
return -ENOMEM;
if (!serio)
return -ENOMEM;
- memset(serio, 0, sizeof(struct serio));
serio->id.type = SERIO_8042;
serio->write = rpckbd_write;
serio->open = rpckbd_open;
serio->id.type = SERIO_8042;
serio->write = rpckbd_write;
serio->open = rpckbd_open;