From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-media@vger.kernel.org, Davidlohr Bueso <dave@stgolabs.net>,
Hans Verkuil <hverkuil@xs4all.nl>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 4/4] [media] usbvision-core: Replace four printk() calls by dev_err()
Date: Thu, 21 Sep 2017 17:09:40 +0200 [thread overview]
Message-ID: <0c53a18c-eba1-524b-8825-7454bb8e58a4@users.sourceforge.net> (raw)
In-Reply-To: <c0e6e8e7-e47d-dc88-3317-2e46eaa51dc6@users.sourceforge.net>
From: Markus Elfring <elfring@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 <elfring@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
prev parent reply other threads:[~2017-09-21 15:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-21 15:04 [PATCH 0/4] [media] usbvision-core: Fine-tuning for some function implementations SF Markus Elfring
2017-09-21 15:06 ` [PATCH 1/4] [media] usbvision-core: Use common error handling code in usbvision_set_input() SF Markus Elfring
2017-09-21 15:07 ` [PATCH 2/4] [media] usbvision-core: Use common error handling code in usbvision_set_compress_params() SF Markus Elfring
2017-09-22 11:44 ` Dan Carpenter
2017-09-22 14:50 ` SF Markus Elfring
2017-09-21 15:08 ` [PATCH 3/4] [media] usbvision-core: Delete unnecessary braces in 11 functions SF Markus Elfring
2017-09-22 11:42 ` Dan Carpenter
2017-09-22 15:03 ` SF Markus Elfring
2017-09-21 15:09 ` SF Markus Elfring [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0c53a18c-eba1-524b-8825-7454bb8e58a4@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=dave@stgolabs.net \
--cc=hverkuil@xs4all.nl \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).