diff options
Diffstat (limited to 'drivers/input/joystick/twidjoy.c')
-rw-r--r-- | drivers/input/joystick/twidjoy.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/input/joystick/twidjoy.c b/drivers/input/joystick/twidjoy.c index 076f237d9654..49085df2d631 100644 --- a/drivers/input/joystick/twidjoy.c +++ b/drivers/input/joystick/twidjoy.c | |||
@@ -104,7 +104,7 @@ struct twidjoy { | |||
104 | * Twiddler. It updates the data accordingly. | 104 | * Twiddler. It updates the data accordingly. |
105 | */ | 105 | */ |
106 | 106 | ||
107 | static void twidjoy_process_packet(struct twidjoy *twidjoy, struct pt_regs *regs) | 107 | static void twidjoy_process_packet(struct twidjoy *twidjoy) |
108 | { | 108 | { |
109 | struct input_dev *dev = twidjoy->dev; | 109 | struct input_dev *dev = twidjoy->dev; |
110 | unsigned char *data = twidjoy->data; | 110 | unsigned char *data = twidjoy->data; |
@@ -113,8 +113,6 @@ static void twidjoy_process_packet(struct twidjoy *twidjoy, struct pt_regs *regs | |||
113 | 113 | ||
114 | button_bits = ((data[1] & 0x7f) << 7) | (data[0] & 0x7f); | 114 | button_bits = ((data[1] & 0x7f) << 7) | (data[0] & 0x7f); |
115 | 115 | ||
116 | input_regs(dev, regs); | ||
117 | |||
118 | for (bp = twidjoy_buttons; bp->bitmask; bp++) { | 116 | for (bp = twidjoy_buttons; bp->bitmask; bp++) { |
119 | int value = (button_bits & (bp->bitmask << bp->bitshift)) >> bp->bitshift; | 117 | int value = (button_bits & (bp->bitmask << bp->bitshift)) >> bp->bitshift; |
120 | int i; | 118 | int i; |
@@ -141,7 +139,7 @@ static void twidjoy_process_packet(struct twidjoy *twidjoy, struct pt_regs *regs | |||
141 | * packet processing routine. | 139 | * packet processing routine. |
142 | */ | 140 | */ |
143 | 141 | ||
144 | static irqreturn_t twidjoy_interrupt(struct serio *serio, unsigned char data, unsigned int flags, struct pt_regs *regs) | 142 | static irqreturn_t twidjoy_interrupt(struct serio *serio, unsigned char data, unsigned int flags) |
145 | { | 143 | { |
146 | struct twidjoy *twidjoy = serio_get_drvdata(serio); | 144 | struct twidjoy *twidjoy = serio_get_drvdata(serio); |
147 | 145 | ||
@@ -158,7 +156,7 @@ static irqreturn_t twidjoy_interrupt(struct serio *serio, unsigned char data, un | |||
158 | twidjoy->data[twidjoy->idx++] = data; | 156 | twidjoy->data[twidjoy->idx++] = data; |
159 | 157 | ||
160 | if (twidjoy->idx == TWIDJOY_MAX_LENGTH) { | 158 | if (twidjoy->idx == TWIDJOY_MAX_LENGTH) { |
161 | twidjoy_process_packet(twidjoy, regs); | 159 | twidjoy_process_packet(twidjoy); |
162 | twidjoy->idx = 0; | 160 | twidjoy->idx = 0; |
163 | } | 161 | } |
164 | 162 | ||