diff options
Diffstat (limited to 'drivers/input/joystick/magellan.c')
-rw-r--r-- | drivers/input/joystick/magellan.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/input/joystick/magellan.c b/drivers/input/joystick/magellan.c index 168b1061a03b..e3d19444ba2e 100644 --- a/drivers/input/joystick/magellan.c +++ b/drivers/input/joystick/magellan.c | |||
@@ -82,7 +82,7 @@ static int magellan_crunch_nibbles(unsigned char *data, int count) | |||
82 | return 0; | 82 | return 0; |
83 | } | 83 | } |
84 | 84 | ||
85 | static void magellan_process_packet(struct magellan* magellan, struct pt_regs *regs) | 85 | static void magellan_process_packet(struct magellan* magellan) |
86 | { | 86 | { |
87 | struct input_dev *dev = magellan->dev; | 87 | struct input_dev *dev = magellan->dev; |
88 | unsigned char *data = magellan->data; | 88 | unsigned char *data = magellan->data; |
@@ -90,8 +90,6 @@ static void magellan_process_packet(struct magellan* magellan, struct pt_regs *r | |||
90 | 90 | ||
91 | if (!magellan->idx) return; | 91 | if (!magellan->idx) return; |
92 | 92 | ||
93 | input_regs(dev, regs); | ||
94 | |||
95 | switch (magellan->data[0]) { | 93 | switch (magellan->data[0]) { |
96 | 94 | ||
97 | case 'd': /* Axis data */ | 95 | case 'd': /* Axis data */ |
@@ -115,12 +113,12 @@ static void magellan_process_packet(struct magellan* magellan, struct pt_regs *r | |||
115 | } | 113 | } |
116 | 114 | ||
117 | static irqreturn_t magellan_interrupt(struct serio *serio, | 115 | static irqreturn_t magellan_interrupt(struct serio *serio, |
118 | unsigned char data, unsigned int flags, struct pt_regs *regs) | 116 | unsigned char data, unsigned int flags) |
119 | { | 117 | { |
120 | struct magellan* magellan = serio_get_drvdata(serio); | 118 | struct magellan* magellan = serio_get_drvdata(serio); |
121 | 119 | ||
122 | if (data == '\r') { | 120 | if (data == '\r') { |
123 | magellan_process_packet(magellan, regs); | 121 | magellan_process_packet(magellan); |
124 | magellan->idx = 0; | 122 | magellan->idx = 0; |
125 | } else { | 123 | } else { |
126 | if (magellan->idx < MAGELLAN_MAX_LENGTH) | 124 | if (magellan->idx < MAGELLAN_MAX_LENGTH) |