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, 4 insertions, 2 deletions

diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index 6b66ae4f430f..6057098282ca 100644
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -119,7 +119,8 @@ static inline int usb_find_address(struct i2c_adapter *i2c_adap,
                 /* try extended address code... */
                 ret = try_write_address(i2c_adap, addr, retries);
                 if (ret != 1) {
-                        err("died at extended address code, while writing");
+                        dev_err(&i2c_adap->dev,
+                                "died at extended address code, while writing\n");
                         return -EREMOTEIO;
                 }
                 add[0] = addr;
@@ -128,7 +129,8 @@ static inline int usb_find_address(struct i2c_adapter *i2c_adap,
                         addr |= 0x01;
                         ret = try_read_address(i2c_adap, addr, retries);
                         if (ret != 1) {
-                                err("died at extended address code, while reading");
+                                dev_err(&i2c_adap->dev,
+                                        "died at extended address code, while reading\n");
                                 return -EREMOTEIO;
                         }
                 }