[PATCH 4/4] [media] usbvision-core: Replace four printk() calls by dev_err()

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Thu, 21 Sep 2017 16:47:28 +0200

* Replace the local variable "proc" by the identifier "__func__".

* Use the interface "dev_err" instead of "printk" in these functions.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/media/usb/usbvision/usbvision-core.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/media/usb/usbvision/usbvision-core.c 
b/drivers/media/usb/usbvision/usbvision-core.c
index 54db35b03106..2c98805244df 100644
--- a/drivers/media/usb/usbvision/usbvision-core.c
+++ b/drivers/media/usb/usbvision/usbvision-core.c
@@ -1619,7 +1619,6 @@ static int usbvision_init_webcam(struct usb_usbvision 
*usbvision)
  */
 static int usbvision_set_video_format(struct usb_usbvision *usbvision, int 
format)
 {
-       static const char proc[] = "usbvision_set_video_format";
        unsigned char *value = usbvision->ctrl_urb_buffer;
        int rc;
 
@@ -1631,8 +1630,9 @@ static int usbvision_set_video_format(struct 
usb_usbvision *usbvision, int forma
        if ((format != ISOC_MODE_YUV422)
            && (format != ISOC_MODE_YUV420)
            && (format != ISOC_MODE_COMPRESS)) {
-               printk(KERN_ERR "usbvision: unknown video format %02x, using 
default YUV420",
-                      format);
+               dev_err(&usbvision->dev->dev,
+                       "%s: unknown video format %02x, using default YUV420\n",
+                       __func__, format);
                format = ISOC_MODE_YUV420;
        }
        value[0] = 0x0A;  /* TODO: See the effect of the filter */
@@ -1643,8 +1643,9 @@ static int usbvision_set_video_format(struct 
usb_usbvision *usbvision, int forma
                             USB_RECIP_ENDPOINT, 0,
                             (__u16) USBVISION_FILT_CONT, value, 2, HZ);
        if (rc < 0)
-               printk(KERN_ERR "%s: ERROR=%d. USBVISION stopped - reconnect or 
reload driver.\n",
-                      proc, rc);
+               dev_err(&usbvision->dev->dev,
+                       "%s: ERROR=%d. USBVISION stopped - reconnect or reload 
driver.\n",
+                       __func__, rc);
 
        usbvision->isoc_mode = format;
        return rc;
@@ -2180,7 +2181,8 @@ int usbvision_restart_isoc(struct usb_usbvision 
*usbvision)
 int usbvision_audio_off(struct usb_usbvision *usbvision)
 {
        if (usbvision_write_reg(usbvision, USBVISION_IOPIN_REG, 
USBVISION_AUDIO_MUTE) < 0) {
-               printk(KERN_ERR "usbvision_audio_off: can't write reg\n");
+               dev_err(&usbvision->dev->dev,
+                       "%s: can't write reg\n", __func__);
                return -1;
        }
        usbvision->audio_mute = 0;
@@ -2192,7 +2194,9 @@ int usbvision_set_audio(struct usb_usbvision *usbvision, 
int audio_channel)
 {
        if (!usbvision->audio_mute) {
                if (usbvision_write_reg(usbvision, USBVISION_IOPIN_REG, 
audio_channel) < 0) {
-                       printk(KERN_ERR "usbvision_set_audio: can't write iopin 
register for audio switching\n");
+                       dev_err(&usbvision->dev->dev,
+                               "%s: can't write iopin register for audio 
switching\n",
+                               __func__);
                        return -1;
                }
        }
-- 
2.14.1