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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 22cd96f58c99b33451f2cc99757fb561ab738232..955441cb030d6b1bd6304ce1a786ab6d6a9bd8e4 100644 (file)
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -1380,8 +1380,9 @@ exit:
        usb_mark_last_busy(interface_to_usbdev(usbtouch->interface));
        retval = usb_submit_urb(urb, GFP_ATOMIC);
        if (retval)
-               err("%s - usb_submit_urb failed with result: %d",
-                   __func__, retval);
+               dev_err(&usbtouch->interface->dev,
+                       "%s - usb_submit_urb failed with result: %d\n",
+                       __func__, retval);
 }
 
 static int usbtouch_open(struct input_dev *input)
@@ -1622,8 +1623,9 @@ static int usbtouch_probe(struct usb_interface *intf,
                err = usb_submit_urb(usbtouch->irq, GFP_KERNEL);
                if (err) {
                        usb_autopm_put_interface(intf);
-                       err("%s - usb_submit_urb failed with result: %d",
-                           __func__, err);
+                       dev_err(&intf->dev,
+                               "%s - usb_submit_urb failed with result: %d\n",
+                               __func__, err);
                        goto out_unregister_input;
                }
        }