diff options
Diffstat (limited to 'drivers/input/misc/keyspan_remote.c')
| -rw-r--r-- | drivers/input/misc/keyspan_remote.c | 23 | 
1 files changed, 16 insertions, 7 deletions
diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c index d99151a8bf1..290fa5f97de 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)  	 * though so it's not too big a deal  	 */  	if (dev->data.pos >= dev->data.len) { -		dev_dbg(&dev->udev->dev, +		dev_dbg(&dev->interface->dev,  			"%s - Error ran out of data. pos: %d, len: %d\n",  			__func__, dev->data.pos, dev->data.len);  		return -1; @@ -267,7 +267,9 @@ static void keyspan_check_data(struct usb_keyspan *remote)  				remote->data.tester = remote->data.tester >> 6;  				remote->data.bits_left -= 6;  			} else { -				err("%s - Unknown sequence found in system data.\n", __func__); +				dev_err(&remote->interface->dev, +					"%s - Unknown sequence found in system data.\n", +					__func__);  				remote->stage = 0;  				return;  			} @@ -286,7 +288,9 @@ static void keyspan_check_data(struct usb_keyspan *remote)  				remote->data.tester = remote->data.tester >> 6;  				remote->data.bits_left -= 6;  			} else { -				err("%s - Unknown sequence found in button data.\n", __func__); +				dev_err(&remote->interface->dev, +					"%s - Unknown sequence found in button data.\n", +					__func__);  				remote->stage = 0;  				return;  			} @@ -302,7 +306,9 @@ static void keyspan_check_data(struct usb_keyspan *remote)  			remote->data.tester = remote->data.tester >> 6;  			remote->data.bits_left -= 6;  		} else { -			err("%s - Error in message, invalid toggle.\n", __func__); +			dev_err(&remote->interface->dev, +				"%s - Error in message, invalid toggle.\n", +				__func__);  			remote->stage = 0;  			return;  		} @@ -312,10 +318,11 @@ static void keyspan_check_data(struct usb_keyspan *remote)  			remote->data.tester = remote->data.tester >> 5;  			remote->data.bits_left -= 5;  		} else { -			err("Bad message received, no stop bit found.\n"); +			dev_err(&remote->interface->dev, +				"Bad message received, no stop bit found.\n");  		} -		dev_dbg(&remote->udev->dev, +		dev_dbg(&remote->interface->dev,  			"%s found valid message: system: %d, button: %d, toggle: %d\n",  			__func__, message.system, message.button, message.toggle); @@ -397,7 +404,9 @@ static void keyspan_irq_recv(struct urb *urb)  resubmit:  	retval = usb_submit_urb(urb, GFP_ATOMIC);  	if (retval) -		err ("%s - usb_submit_urb failed with result: %d", __func__, retval); +		dev_err(&dev->interface->dev, +			"%s - usb_submit_urb failed with result: %d\n", +			__func__, retval);  }  static int keyspan_open(struct input_dev *dev)  |