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
/
gscps2.c
diff --git
a/drivers/input/serio/gscps2.c
b/drivers/input/serio/gscps2.c
index
a7b0de0
..
74f14e0
100644
(file)
--- a/
drivers/input/serio/gscps2.c
+++ b/
drivers/input/serio/gscps2.c
@@
-1,7
+1,7
@@
/*
* drivers/input/serio/gscps2.c
*
/*
* drivers/input/serio/gscps2.c
*
- * Copyright (c) 2004 Helge Deller <deller@gmx.de>
+ * Copyright (c) 2004
-2006
Helge Deller <deller@gmx.de>
* Copyright (c) 2002 Laurent Canet <canetl@esiee.fr>
* Copyright (c) 2002 Thibaut Varene <varenet@parisc-linux.org>
*
* Copyright (c) 2002 Laurent Canet <canetl@esiee.fr>
* Copyright (c) 2002 Thibaut Varene <varenet@parisc-linux.org>
*
@@
-22,7
+22,6
@@
* was usable/enabled ?)
*/
* was usable/enabled ?)
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/serio.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/serio.h>
@@
-83,7
+82,7
@@
MODULE_DEVICE_TABLE(parisc, gscps2_device_tbl);
#define GSC_ID_MOUSE 1
#define GSC_ID_MOUSE 1
-static irqreturn_t gscps2_interrupt(int irq, void *dev
, struct pt_regs *regs
);
+static irqreturn_t gscps2_interrupt(int irq, void *dev);
#define BUFFER_SIZE 0x0f
#define BUFFER_SIZE 0x0f
@@
-167,7
+166,7
@@
static inline int gscps2_writeb_output(struct gscps2port *ps2port, u8 data)
/* make sure any received data is returned as fast as possible */
/* this is important e.g. when we set the LEDs on the keyboard */
/* make sure any received data is returned as fast as possible */
/* this is important e.g. when we set the LEDs on the keyboard */
- gscps2_interrupt(0, NULL
, NULL
);
+ gscps2_interrupt(0, NULL);
return 1;
}
return 1;
}
@@
-227,7
+226,7
@@
static LIST_HEAD(ps2port_list);
* later.
*/
* later.
*/
-static irqreturn_t gscps2_interrupt(int irq, void *dev
, struct pt_regs *regs
)
+static irqreturn_t gscps2_interrupt(int irq, void *dev)
{
struct gscps2port *ps2port;
{
struct gscps2port *ps2port;
@@
-268,7
+267,7
@@
static irqreturn_t gscps2_interrupt(int irq, void *dev, struct pt_regs *regs)
rxflags = ((status & GSC_STAT_TERR) ? SERIO_TIMEOUT : 0 ) |
((status & GSC_STAT_PERR) ? SERIO_PARITY : 0 );
rxflags = ((status & GSC_STAT_TERR) ? SERIO_TIMEOUT : 0 ) |
((status & GSC_STAT_PERR) ? SERIO_PARITY : 0 );
- serio_interrupt(ps2port->port, data, rxflags
, regs
);
+ serio_interrupt(ps2port->port, data, rxflags);
} /* while() */
} /* while() */
@@
-307,7
+306,7
@@
static int gscps2_open(struct serio *port)
/* enable it */
gscps2_enable(ps2port, ENABLE);
/* enable it */
gscps2_enable(ps2port, ENABLE);
- gscps2_interrupt(0, NULL
, NULL
);
+ gscps2_interrupt(0, NULL);
return 0;
}
return 0;
}
@@
-354,7
+353,7
@@
static int __init gscps2_probe(struct parisc_device *dev)
memset(serio, 0, sizeof(struct serio));
ps2port->port = serio;
ps2port->padev = dev;
memset(serio, 0, sizeof(struct serio));
ps2port->port = serio;
ps2port->padev = dev;
- ps2port->addr = ioremap(hpa, GSC_STATUS + 4);
+ ps2port->addr = ioremap
_nocache
(hpa, GSC_STATUS + 4);
spin_lock_init(&ps2port->lock);
gscps2_reset(ps2port);
spin_lock_init(&ps2port->lock);
gscps2_reset(ps2port);
@@
-371,7
+370,7
@@
static int __init gscps2_probe(struct parisc_device *dev)
serio->dev.parent = &dev->dev;
ret = -EBUSY;
serio->dev.parent = &dev->dev;
ret = -EBUSY;
- if (request_irq(dev->irq, gscps2_interrupt,
SA_SHIRQ
, ps2port->port->name, ps2port))
+ if (request_irq(dev->irq, gscps2_interrupt,
IRQF_SHARED
, ps2port->port->name, ps2port))
goto fail_miserably;
if (ps2port->id != GSC_ID_KEYBOARD && ps2port->id != GSC_ID_MOUSE) {
goto fail_miserably;
if (ps2port->id != GSC_ID_KEYBOARD && ps2port->id != GSC_ID_MOUSE) {