Commit e27ad0fe authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: usbtouchscreen.c: remove err() usage

err() was a very old USB-specific macro that I thought had
gone away.  This patch removes it from being used in the
driver and uses dev_err() instead.

CC: Dmitry Torokhov <dmitry.torokhov@gmail.com>
CC: Henrik Rydberg <rydberg@euromail.se>
CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Viresh Kumar <viresh.kumar@st.com>
CC: Armando Visconti <armando.visconti@st.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b3169fec
...@@ -1380,8 +1380,9 @@ static void usbtouch_irq(struct urb *urb) ...@@ -1380,8 +1380,9 @@ static void usbtouch_irq(struct urb *urb)
usb_mark_last_busy(interface_to_usbdev(usbtouch->interface)); usb_mark_last_busy(interface_to_usbdev(usbtouch->interface));
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
err("%s - usb_submit_urb failed with result: %d", dev_err(&usbtouch->interface->dev,
__func__, retval); "%s - usb_submit_urb failed with result: %d\n",
__func__, retval);
} }
static int usbtouch_open(struct input_dev *input) static int usbtouch_open(struct input_dev *input)
...@@ -1622,8 +1623,9 @@ static int usbtouch_probe(struct usb_interface *intf, ...@@ -1622,8 +1623,9 @@ static int usbtouch_probe(struct usb_interface *intf,
err = usb_submit_urb(usbtouch->irq, GFP_KERNEL); err = usb_submit_urb(usbtouch->irq, GFP_KERNEL);
if (err) { if (err) {
usb_autopm_put_interface(intf); usb_autopm_put_interface(intf);
err("%s - usb_submit_urb failed with result: %d", dev_err(&intf->dev,
__func__, err); "%s - usb_submit_urb failed with result: %d\n",
__func__, err);
goto out_unregister_input; goto out_unregister_input;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment