aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-04 18:32:58 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-04 18:32:58 -0400
commit419b1a11fbe7889f8c3e62b0ef33e8b393279563 (patch)
tree7c7c4995f45e3e59ec90717a73ed4bc9fd5c977a /drivers/input
parentab242a73a109c227d6ed0fcccab5dd2d9e220b07 (diff)
USB: input: keyspan_remote.c: fix up dev_* messages
Previously I had made the struct device point to the input device, but after talking with Dmitry, he said that the USB device would make more sense for this driver to point to. So converted it to use that instead. CC: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/keyspan_remote.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c
index 7f017d497d83..290fa5f97ded 100644
--- a/drivers/input/misc/keyspan_remote.c
+++ b/drivers/input/misc/keyspan_remote.c
@@ -157,7 +157,7 @@ static int keyspan_load_tester(struct usb_keyspan* dev, int bits_needed)
157 * though so it's not too big a deal 157 * though so it's not too big a deal
158 */ 158 */
159 if (dev->data.pos >= dev->data.len) { 159 if (dev->data.pos >= dev->data.len) {
160 dev_dbg(&dev->udev->dev, 160 dev_dbg(&dev->interface->dev,
161 "%s - Error ran out of data. pos: %d, len: %d\n", 161 "%s - Error ran out of data. pos: %d, len: %d\n",
162 __func__, dev->data.pos, dev->data.len); 162 __func__, dev->data.pos, dev->data.len);
163 return -1; 163 return -1;
@@ -267,7 +267,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
267 remote->data.tester = remote->data.tester >> 6; 267 remote->data.tester = remote->data.tester >> 6;
268 remote->data.bits_left -= 6; 268 remote->data.bits_left -= 6;
269 } else { 269 } else {
270 dev_err(&remote->input->dev, 270 dev_err(&remote->interface->dev,
271 "%s - Unknown sequence found in system data.\n", 271 "%s - Unknown sequence found in system data.\n",
272 __func__); 272 __func__);
273 remote->stage = 0; 273 remote->stage = 0;
@@ -288,7 +288,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
288 remote->data.tester = remote->data.tester >> 6; 288 remote->data.tester = remote->data.tester >> 6;
289 remote->data.bits_left -= 6; 289 remote->data.bits_left -= 6;
290 } else { 290 } else {
291 dev_err(&remote->input->dev, 291 dev_err(&remote->interface->dev,
292 "%s - Unknown sequence found in button data.\n", 292 "%s - Unknown sequence found in button data.\n",
293 __func__); 293 __func__);
294 remote->stage = 0; 294 remote->stage = 0;
@@ -306,7 +306,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
306 remote->data.tester = remote->data.tester >> 6; 306 remote->data.tester = remote->data.tester >> 6;
307 remote->data.bits_left -= 6; 307 remote->data.bits_left -= 6;
308 } else { 308 } else {
309 dev_err(&remote->input->dev, 309 dev_err(&remote->interface->dev,
310 "%s - Error in message, invalid toggle.\n", 310 "%s - Error in message, invalid toggle.\n",
311 __func__); 311 __func__);
312 remote->stage = 0; 312 remote->stage = 0;
@@ -318,11 +318,11 @@ static void keyspan_check_data(struct usb_keyspan *remote)
318 remote->data.tester = remote->data.tester >> 5; 318 remote->data.tester = remote->data.tester >> 5;
319 remote->data.bits_left -= 5; 319 remote->data.bits_left -= 5;
320 } else { 320 } else {
321 dev_err(&remote->input->dev, 321 dev_err(&remote->interface->dev,
322 "Bad message received, no stop bit found.\n"); 322 "Bad message received, no stop bit found.\n");
323 } 323 }
324 324
325 dev_dbg(&remote->udev->dev, 325 dev_dbg(&remote->interface->dev,
326 "%s found valid message: system: %d, button: %d, toggle: %d\n", 326 "%s found valid message: system: %d, button: %d, toggle: %d\n",
327 __func__, message.system, message.button, message.toggle); 327 __func__, message.system, message.button, message.toggle);
328 328
@@ -404,7 +404,7 @@ static void keyspan_irq_recv(struct urb *urb)
404resubmit: 404resubmit:
405 retval = usb_submit_urb(urb, GFP_ATOMIC); 405 retval = usb_submit_urb(urb, GFP_ATOMIC);
406 if (retval) 406 if (retval)
407 dev_err(&dev->input->dev, 407 dev_err(&dev->interface->dev,
408 "%s - usb_submit_urb failed with result: %d\n", 408 "%s - usb_submit_urb failed with result: %d\n",
409 __func__, retval); 409 __func__, retval);
410} 410}