V4L/DVB (10298): remove err macro from few usb devices

Patch removes err() macros from few usb devices.
It places pr_err in pvrusb2-v4l2.c, dev_err in dabusb and in usbvision
drivers. Beside placing dev_err, patch defines new s2255_dev_err macro
with S2255_DRIVER_NAME in s2255 module.

Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
Acked-by: Thierry Merle <thierry.merle@free.fr>
Acked-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 3163c6df448a..b7caf135ed55 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -1268,8 +1268,9 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
                 dip->minor_type = pvr2_v4l_type_video;
                 nr_ptr = video_nr;
                 if (!dip->stream) {
-                        err("Failed to set up pvrusb2 v4l video dev"
-                            " due to missing stream instance");
+                        pr_err(KBUILD_MODNAME
+                                ": Failed to set up pvrusb2 v4l video dev"
+                                " due to missing stream instance\n");
                         return;
                 }
                 break;
@@ -1286,8 +1287,8 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
                 break;
         default:
                 /* Bail out (this should be impossible) */
-                err("Failed to set up pvrusb2 v4l dev"
-                    " due to unrecognized config");
+                pr_err(KBUILD_MODNAME ": Failed to set up pvrusb2 v4l dev"
+                    " due to unrecognized config\n");
                 return;
         }
 
@@ -1303,7 +1304,8 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
                                    dip->v4l_type, mindevnum) < 0) &&
             (video_register_device(&dip->devbase,
                                    dip->v4l_type, -1) < 0)) {
-                err("Failed to register pvrusb2 v4l device");
+                pr_err(KBUILD_MODNAME
+                        ": Failed to register pvrusb2 v4l device\n");
         }
 
         printk(KERN_INFO "pvrusb2: registered device %s%u [%s]\n",