]> git.karo-electronics.de Git - linux-beck.git/commitdiff
USB: as102_usb_drv.c: remove err() usage
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Apr 2012 21:48:57 +0000 (14:48 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Apr 2012 21:48:57 +0000 (14:48 -0700)
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: Mauro Carvalho Chehab <mchehab@infradead.org>
CC: Sylwester Nawrocki <snjw23@gmail.com>
CC: Piotr Chmura <chmooreck@poczta.onet.pl>
CC: Devin Heitmueller <dheitmueller@kernellabs.com>
CC: Gianluca Gennari <gennarone@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/media/as102/as102_usb_drv.c

index 0f6bfe7eccba344a71868db8c6a0a6261cd31a06..6875c88e7becbac0a2ca29c6416a1999afc511c5 100644 (file)
@@ -375,7 +375,7 @@ static int as102_usb_probe(struct usb_interface *intf,
 
        as102_dev = kzalloc(sizeof(struct as102_dev_t), GFP_KERNEL);
        if (as102_dev == NULL) {
-               err("%s: kzalloc failed", __func__);
+               dev_err(&intf->dev, "%s: kzalloc failed\n", __func__);
                return -ENOMEM;
        }
 
@@ -411,8 +411,9 @@ static int as102_usb_probe(struct usb_interface *intf,
        ret = usb_register_dev(intf, &as102_usb_class_driver);
        if (ret < 0) {
                /* something prevented us from registering this driver */
-               err("%s: usb_register_dev() failed (errno = %d)",
-                   __func__, ret);
+               dev_err(&intf->dev,
+                       "%s: usb_register_dev() failed (errno = %d)\n",
+                       __func__, ret);
                goto failed;
        }