USB: Staging: media: easycap: remove err() usage
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Apr 2012 00:13:54 +0000 (17:13 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Apr 2012 16:08:21 +0000 (09:08 -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: Tomas Winkler <tomas.winkler@intel.com>
Cc: Jesper Juhl <jj@chaosbits.net>
Cc: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/media/easycap/easycap_main.c

index d0fe34afc2e5b2ec6e70af16cc5c040bf3cb45d6..6f83d362ab0d4e7ba59b84c34870297b5164edb1 100644 (file)
@@ -3578,7 +3578,8 @@ static int easycap_usb_probe(struct usb_interface *intf,
 
                if (0 != (video_register_device(&(peasycap->video_device),
                                                        VFL_TYPE_GRABBER, -1))) {
-                       err("Not able to register with videodev");
+                       dev_err(&intf->dev,
+                               "Not able to register with videodev\n");
                        videodev_release(&(peasycap->video_device));
                        return -ENODEV;
                }
@@ -3822,7 +3823,8 @@ static int easycap_usb_probe(struct usb_interface *intf,
 
                rc = easycap_alsa_probe(peasycap);
                if (rc) {
-                       err("easycap_alsa_probe() rc = %i\n", rc);
+                       dev_err(&intf->dev, "easycap_alsa_probe() rc = %i\n",
+                               rc);
                        return -ENODEV;
                }