drop pt_regs arguments from olpc_process_byte (and down the chain)
Andres Salomon
dilinger at debian.unroutableorg
Wed Nov 29 11:14:54 EST 2006
Commit: 73652d15539cb0f64c8cac09a9fc623be8457164
Parent: f8bc9f475639f750d4fb72762a181e618b1a56e1
commit 73652d15539cb0f64c8cac09a9fc623be8457164
Author: Andres Salomon <dilinger at debian.org>
AuthorDate: Fri Oct 6 17:18:05 2006 -0400
Commit: Andres Salomon <dilinger at debian.org>
CommitDate: Fri Oct 6 17:18:05 2006 -0400
drop pt_regs arguments from olpc_process_byte (and down the chain)
Upstream dropped the pt_regs argument from the irq handler, so the
psmouse's protocol_handler callback no longer passes regs.
---
drivers/input/mouse/olpc.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/input/mouse/olpc.c b/drivers/input/mouse/olpc.c
index cd508eb..449eb5e 100644
--- a/drivers/input/mouse/olpc.c
+++ b/drivers/input/mouse/olpc.c
@@ -65,7 +65,7 @@ static const struct olpc_model_info olpc
* pen/finger and is thus sending data this packet.
*/
-static void olpc_process_packet(struct psmouse *psmouse, struct pt_regs *regs)
+static void olpc_process_packet(struct psmouse *psmouse)
{
struct olpc_data *priv = psmouse->private;
unsigned char *packet = psmouse->packet;
@@ -73,8 +73,6 @@ static void olpc_process_packet(struct p
struct input_dev *dev2 = priv->dev2;
int px, py, gx, gy, gz, gs_down, pt_down, left, right;
- input_regs(dev, regs);
-
left = packet[6] & 1;
right = packet[6] & 2;
gx = packet[1] | ((packet[2] & 0x78) << (7 - 3));
@@ -111,7 +109,7 @@ static void olpc_process_packet(struct p
input_sync(dev2);
}
-static psmouse_ret_t olpc_process_byte(struct psmouse *psmouse, struct pt_regs *regs)
+static psmouse_ret_t olpc_process_byte(struct psmouse *psmouse)
{
struct olpc_data *priv = psmouse->private;
psmouse_ret_t ret = PSMOUSE_BAD_DATA;
@@ -132,7 +130,7 @@ static psmouse_ret_t olpc_process_byte(s
goto out;
if (psmouse->pktcnt == 9) {
- olpc_process_packet(psmouse, regs);
+ olpc_process_packet(psmouse);
ret = PSMOUSE_FULL_PACKET;
goto out;
More information about the Commits-kernel
mailing list