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>

3 files changed, 53 insertions, 33 deletions

diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index 9e4f50639975..4444e7e3cdf8 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -381,8 +381,9 @@ int usbvision_scratch_alloc(struct usb_usbvision *usbvision)
         usbvision->scratch = vmalloc_32(scratch_buf_size);
         scratch_reset(usbvision);
         if(usbvision->scratch == NULL) {
-                err("%s: unable to allocate %d bytes for scratch",
-                    __func__, scratch_buf_size);
+                dev_err(&usbvision->dev->dev,
+                        "%s: unable to allocate %d bytes for scratch\n",
+                                __func__, scratch_buf_size);
                 return -ENOMEM;
         }
         return 0;
@@ -491,8 +492,9 @@ int usbvision_decompress_alloc(struct usb_usbvision *usbvision)
         int IFB_size = MAX_FRAME_WIDTH * MAX_FRAME_HEIGHT * 3 / 2;
         usbvision->IntraFrameBuffer = vmalloc_32(IFB_size);
         if (usbvision->IntraFrameBuffer == NULL) {
-                err("%s: unable to allocate %d for compr. frame buffer",
-                    __func__, IFB_size);
+                dev_err(&usbvision->dev->dev,
+                        "%s: unable to allocate %d for compr. frame buffer\n",
+                                __func__, IFB_size);
                 return -ENOMEM;
         }
         return 0;
@@ -1514,8 +1516,9 @@ static void usbvision_isocIrq(struct urb *urb)
         errCode = usb_submit_urb (urb, GFP_ATOMIC);
 
         if(errCode) {
-                err("%s: usb_submit_urb failed: error %d",
-                    __func__, errCode);
+                dev_err(&usbvision->dev->dev,
+                        "%s: usb_submit_urb failed: error %d\n",
+                                __func__, errCode);
         }
 
         return;
@@ -1546,7 +1549,8 @@ int usbvision_read_reg(struct usb_usbvision *usbvision, unsigned char reg)
                                 0, (__u16) reg, buffer, 1, HZ);
 
         if (errCode < 0) {
-                err("%s: failed: error %d", __func__, errCode);
+                dev_err(&usbvision->dev->dev,
+                        "%s: failed: error %d\n", __func__, errCode);
                 return errCode;
         }
         return buffer[0];
@@ -1574,7 +1578,8 @@ int usbvision_write_reg(struct usb_usbvision *usbvision, unsigned char reg,
                                 USB_RECIP_ENDPOINT, 0, (__u16) reg, &value, 1, HZ);
 
         if (errCode < 0) {
-                err("%s: failed: error %d", __func__, errCode);
+                dev_err(&usbvision->dev->dev,
+                        "%s: failed: error %d\n", __func__, errCode);
         }
         return errCode;
 }
@@ -1850,7 +1855,8 @@ int usbvision_set_output(struct usb_usbvision *usbvision, int width,
                                  0, (__u16) USBVISION_LXSIZE_O, value, 4, HZ);
 
                 if (errCode < 0) {
-                        err("%s failed: error %d", __func__, errCode);
+                        dev_err(&usbvision->dev->dev,
+                                "%s failed: error %d\n", __func__, errCode);
                         return errCode;
                 }
                 usbvision->curwidth = usbvision->stretch_width * UsbWidth;
@@ -2236,7 +2242,7 @@ static int usbvision_set_dram_settings(struct usb_usbvision *usbvision)
                              (__u16) USBVISION_DRM_PRM1, value, 8, HZ);
 
         if (rc < 0) {
-                err("%sERROR=%d", __func__, rc);
+                dev_err(&usbvision->dev->dev, "%sERROR=%d\n", __func__, rc);
                 return rc;
         }
 
@@ -2432,8 +2438,9 @@ int usbvision_set_alternate(struct usb_usbvision *dev)
                 PDEBUG(DBG_FUNC,"setting alternate %d with wMaxPacketSize=%u", dev->ifaceAlt,dev->isocPacketSize);
                 errCode = usb_set_interface(dev->dev, dev->iface, dev->ifaceAlt);
                 if (errCode < 0) {
-                        err ("cannot change alternate number to %d (error=%i)",
-                                                        dev->ifaceAlt, errCode);
+                        dev_err(&dev->dev->dev,
+                                "cannot change alternate number to %d (error=%i)\n",
+                                        dev->ifaceAlt, errCode);
                         return errCode;
                 }
         }
@@ -2484,7 +2491,8 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision)
 
                 urb = usb_alloc_urb(USBVISION_URB_FRAMES, GFP_KERNEL);
                 if (urb == NULL) {
-                        err("%s: usb_alloc_urb() failed", __func__);
+                        dev_err(&usbvision->dev->dev,
+                                "%s: usb_alloc_urb() failed\n", __func__);
                         return -ENOMEM;
                 }
                 usbvision->sbuf[bufIdx].urb = urb;
@@ -2516,8 +2524,9 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision)
                         errCode = usb_submit_urb(usbvision->sbuf[bufIdx].urb,
                                                  GFP_KERNEL);
                 if (errCode) {
-                        err("%s: usb_submit_urb(%d) failed: error %d",
-                            __func__, bufIdx, errCode);
+                        dev_err(&usbvision->dev->dev,
+                                "%s: usb_submit_urb(%d) failed: error %d\n",
+                                        __func__, bufIdx, errCode);
                 }
         }
 
@@ -2566,8 +2575,9 @@ void usbvision_stop_isoc(struct usb_usbvision *usbvision)
                 errCode = usb_set_interface(usbvision->dev, usbvision->iface,
                                             usbvision->ifaceAlt);
                 if (errCode < 0) {
-                        err("%s: usb_set_interface() failed: error %d",
-                            __func__, errCode);
+                        dev_err(&usbvision->dev->dev,
+                                "%s: usb_set_interface() failed: error %d\n",
+                                        __func__, errCode);
                         usbvision->last_error = errCode;
                 }
                 regValue = (16-usbvision_read_reg(usbvision, USBVISION_ALTER_REG)) & 0x0F;
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;
                         }
                 }
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 2622de003a45..47d672da5415 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -329,7 +329,7 @@ static void usbvision_create_sysfs(struct video_device *vdev)
                         return;
         } while (0);
 
-        err("%s error: %d\n", __func__, res);
+        dev_err(&vdev->dev, "%s error: %d\n", __func__, res);
 }
 
 static void usbvision_remove_sysfs(struct video_device *vdev)
@@ -487,8 +487,9 @@ static int vidioc_g_register (struct file *file, void *priv,
         /* NT100x has a 8-bit register space */
         errCode = usbvision_read_reg(usbvision, reg->reg&0xff);
         if (errCode < 0) {
-                err("%s: VIDIOC_DBG_G_REGISTER failed: error %d",
-                    __func__, errCode);
+                dev_err(&usbvision->vdev->dev,
+                        "%s: VIDIOC_DBG_G_REGISTER failed: error %d\n",
+                                __func__, errCode);
                 return errCode;
         }
         reg->val = errCode;
@@ -507,8 +508,9 @@ static int vidioc_s_register (struct file *file, void *priv,
         /* NT100x has a 8-bit register space */
         errCode = usbvision_write_reg(usbvision, reg->reg&0xff, reg->val);
         if (errCode < 0) {
-                err("%s: VIDIOC_DBG_S_REGISTER failed: error %d",
-                    __func__, errCode);
+                dev_err(&usbvision->vdev->dev,
+                        "%s: VIDIOC_DBG_S_REGISTER failed: error %d\n",
+                                __func__, errCode);
                 return errCode;
         }
         return 0;
@@ -1189,7 +1191,9 @@ static int usbvision_radio_open(struct file *file)
         mutex_lock(&usbvision->lock);
 
         if (usbvision->user) {
-                err("%s: Someone tried to open an already opened USBVision Radio!", __func__);
+                dev_err(&usbvision->rdev->dev,
+                        "%s: Someone tried to open an already opened USBVision Radio!\n",
+                                __func__);
                 errCode = -EBUSY;
         }
         else {
@@ -1413,7 +1417,8 @@ static struct video_device *usbvision_vdev_init(struct usb_usbvision *usbvision,
         struct video_device *vdev;
 
         if (usb_dev == NULL) {
-                err("%s: usbvision->dev is not set", __func__);
+                dev_err(&usbvision->dev->dev,
+                        "%s: usbvision->dev is not set\n", __func__);
                 return NULL;
         }
 
@@ -1524,7 +1529,9 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
         return 0;
 
  err_exit:
-        err("USBVision[%d]: video_register_device() failed", usbvision->nr);
+        dev_err(&usbvision->dev->dev,
+                "USBVision[%d]: video_register_device() failed\n",
+                        usbvision->nr);
         usbvision_unregister_video(usbvision);
         return -1;
 }
@@ -1675,20 +1682,20 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
         }
         endpoint = &interface->endpoint[1].desc;
         if (!usb_endpoint_xfer_isoc(endpoint)) {
-                err("%s: interface %d. has non-ISO endpoint!",
+                dev_err(&intf->dev, "%s: interface %d. has non-ISO endpoint!\n",
                     __func__, ifnum);
-                err("%s: Endpoint attributes %d",
+                dev_err(&intf->dev, "%s: Endpoint attributes %d",
                     __func__, endpoint->bmAttributes);
                 return -ENODEV;
         }
         if (usb_endpoint_dir_out(endpoint)) {
-                err("%s: interface %d. has ISO OUT endpoint!",
+                dev_err(&intf->dev, "%s: interface %d. has ISO OUT endpoint!\n",
                     __func__, ifnum);
                 return -ENODEV;
         }
 
         if ((usbvision = usbvision_alloc(dev)) == NULL) {
-                err("%s: couldn't allocate USBVision struct", __func__);
+                dev_err(&intf->dev, "%s: couldn't allocate USBVision struct\n", __func__);
                 return -ENOMEM;
         }
 
@@ -1711,7 +1718,7 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
         usbvision->alt_max_pkt_size = kmalloc(32*
                                               usbvision->num_alt,GFP_KERNEL);
         if (usbvision->alt_max_pkt_size == NULL) {
-                err("usbvision: out of memory!\n");
+                dev_err(&intf->dev, "usbvision: out of memory!\n");
                 mutex_unlock(&usbvision->lock);
                 return -ENOMEM;
         }
@@ -1772,7 +1779,8 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
         PDEBUG(DBG_PROBE, "");
 
         if (usbvision == NULL) {
-                err("%s: usb_get_intfdata() failed", __func__);
+                dev_err(&usbvision->dev->dev,
+                        "%s: usb_get_intfdata() failed\n", __func__);
                 return;
         }
         usb_set_intfdata (intf, NULL);