diff options
Diffstat (limited to 'drivers/input/joystick/iforce')
-rw-r--r-- | drivers/input/joystick/iforce/iforce-packets.c | 6 | ||||
-rw-r--r-- | drivers/input/joystick/iforce/iforce-serio.c | 4 | ||||
-rw-r--r-- | drivers/input/joystick/iforce/iforce-usb.c | 8 | ||||
-rw-r--r-- | drivers/input/joystick/iforce/iforce.h | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c index 8632d47a7fbe..808f05932a6f 100644 --- a/drivers/input/joystick/iforce/iforce-packets.c +++ b/drivers/input/joystick/iforce/iforce-packets.c | |||
@@ -155,7 +155,7 @@ static int mark_core_as_ready(struct iforce *iforce, unsigned short addr) | |||
155 | return -1; | 155 | return -1; |
156 | } | 156 | } |
157 | 157 | ||
158 | void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data, struct pt_regs *regs) | 158 | void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data) |
159 | { | 159 | { |
160 | struct input_dev *dev = iforce->dev; | 160 | struct input_dev *dev = iforce->dev; |
161 | int i; | 161 | int i; |
@@ -183,9 +183,6 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data, | |||
183 | 183 | ||
184 | case 0x01: /* joystick position data */ | 184 | case 0x01: /* joystick position data */ |
185 | case 0x03: /* wheel position data */ | 185 | case 0x03: /* wheel position data */ |
186 | |||
187 | input_regs(dev, regs); | ||
188 | |||
189 | if (HI(cmd) == 1) { | 186 | if (HI(cmd) == 1) { |
190 | input_report_abs(dev, ABS_X, (__s16) (((__s16)data[1] << 8) | data[0])); | 187 | input_report_abs(dev, ABS_X, (__s16) (((__s16)data[1] << 8) | data[0])); |
191 | input_report_abs(dev, ABS_Y, (__s16) (((__s16)data[3] << 8) | data[2])); | 188 | input_report_abs(dev, ABS_Y, (__s16) (((__s16)data[3] << 8) | data[2])); |
@@ -224,7 +221,6 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data, | |||
224 | break; | 221 | break; |
225 | 222 | ||
226 | case 0x02: /* status report */ | 223 | case 0x02: /* status report */ |
227 | input_regs(dev, regs); | ||
228 | input_report_key(dev, BTN_DEAD, data[0] & 0x02); | 224 | input_report_key(dev, BTN_DEAD, data[0] & 0x02); |
229 | input_sync(dev); | 225 | input_sync(dev); |
230 | 226 | ||
diff --git a/drivers/input/joystick/iforce/iforce-serio.c b/drivers/input/joystick/iforce/iforce-serio.c index 64a78c515484..ca08f45c2040 100644 --- a/drivers/input/joystick/iforce/iforce-serio.c +++ b/drivers/input/joystick/iforce/iforce-serio.c | |||
@@ -81,7 +81,7 @@ static void iforce_serio_write_wakeup(struct serio *serio) | |||
81 | } | 81 | } |
82 | 82 | ||
83 | static irqreturn_t iforce_serio_irq(struct serio *serio, | 83 | static irqreturn_t iforce_serio_irq(struct serio *serio, |
84 | unsigned char data, unsigned int flags, struct pt_regs *regs) | 84 | unsigned char data, unsigned int flags) |
85 | { | 85 | { |
86 | struct iforce *iforce = serio_get_drvdata(serio); | 86 | struct iforce *iforce = serio_get_drvdata(serio); |
87 | 87 | ||
@@ -115,7 +115,7 @@ static irqreturn_t iforce_serio_irq(struct serio *serio, | |||
115 | } | 115 | } |
116 | 116 | ||
117 | if (iforce->idx == iforce->len) { | 117 | if (iforce->idx == iforce->len) { |
118 | iforce_process_packet(iforce, (iforce->id << 8) | iforce->idx, iforce->data, regs); | 118 | iforce_process_packet(iforce, (iforce->id << 8) | iforce->idx, iforce->data); |
119 | iforce->pkt = 0; | 119 | iforce->pkt = 0; |
120 | iforce->id = 0; | 120 | iforce->id = 0; |
121 | iforce->len = 0; | 121 | iforce->len = 0; |
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c index fe79d158456d..105112fb7b57 100644 --- a/drivers/input/joystick/iforce/iforce-usb.c +++ b/drivers/input/joystick/iforce/iforce-usb.c | |||
@@ -74,7 +74,7 @@ void iforce_usb_xmit(struct iforce *iforce) | |||
74 | spin_unlock_irqrestore(&iforce->xmit_lock, flags); | 74 | spin_unlock_irqrestore(&iforce->xmit_lock, flags); |
75 | } | 75 | } |
76 | 76 | ||
77 | static void iforce_usb_irq(struct urb *urb, struct pt_regs *regs) | 77 | static void iforce_usb_irq(struct urb *urb) |
78 | { | 78 | { |
79 | struct iforce *iforce = urb->context; | 79 | struct iforce *iforce = urb->context; |
80 | int status; | 80 | int status; |
@@ -96,7 +96,7 @@ static void iforce_usb_irq(struct urb *urb, struct pt_regs *regs) | |||
96 | } | 96 | } |
97 | 97 | ||
98 | iforce_process_packet(iforce, | 98 | iforce_process_packet(iforce, |
99 | (iforce->data[0] << 8) | (urb->actual_length - 1), iforce->data + 1, regs); | 99 | (iforce->data[0] << 8) | (urb->actual_length - 1), iforce->data + 1); |
100 | 100 | ||
101 | exit: | 101 | exit: |
102 | status = usb_submit_urb (urb, GFP_ATOMIC); | 102 | status = usb_submit_urb (urb, GFP_ATOMIC); |
@@ -105,7 +105,7 @@ exit: | |||
105 | __FUNCTION__, status); | 105 | __FUNCTION__, status); |
106 | } | 106 | } |
107 | 107 | ||
108 | static void iforce_usb_out(struct urb *urb, struct pt_regs *regs) | 108 | static void iforce_usb_out(struct urb *urb) |
109 | { | 109 | { |
110 | struct iforce *iforce = urb->context; | 110 | struct iforce *iforce = urb->context; |
111 | 111 | ||
@@ -119,7 +119,7 @@ static void iforce_usb_out(struct urb *urb, struct pt_regs *regs) | |||
119 | wake_up(&iforce->wait); | 119 | wake_up(&iforce->wait); |
120 | } | 120 | } |
121 | 121 | ||
122 | static void iforce_usb_ctrl(struct urb *urb, struct pt_regs *regs) | 122 | static void iforce_usb_ctrl(struct urb *urb) |
123 | { | 123 | { |
124 | struct iforce *iforce = urb->context; | 124 | struct iforce *iforce = urb->context; |
125 | if (urb->status) return; | 125 | if (urb->status) return; |
diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h index 947df2739843..ffaeaefa1a42 100644 --- a/drivers/input/joystick/iforce/iforce.h +++ b/drivers/input/joystick/iforce/iforce.h | |||
@@ -160,7 +160,7 @@ void iforce_delete_device(struct iforce *iforce); | |||
160 | 160 | ||
161 | /* iforce-packets.c */ | 161 | /* iforce-packets.c */ |
162 | int iforce_control_playback(struct iforce*, u16 id, unsigned int); | 162 | int iforce_control_playback(struct iforce*, u16 id, unsigned int); |
163 | void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data, struct pt_regs *regs); | 163 | void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data); |
164 | int iforce_send_packet(struct iforce *iforce, u16 cmd, unsigned char* data); | 164 | int iforce_send_packet(struct iforce *iforce, u16 cmd, unsigned char* data); |
165 | void iforce_dump_packet(char *msg, u16 cmd, unsigned char *data) ; | 165 | void iforce_dump_packet(char *msg, u16 cmd, unsigned char *data) ; |
166 | int iforce_get_id_packet(struct iforce *iforce, char *packet); | 166 | int iforce_get_id_packet(struct iforce *iforce, char *packet); |