diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-08-14 09:37:34 -0700 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-08-14 09:37:34 -0700 |
| commit | 28112395096dc4e16c80176a29ee15dad1706bc6 (patch) | |
| tree | 34b6ad8d62fc5b4eb8d4058ee46c328e62b0b252 /linux/drivers/media/radio | |
| parent | aa3a71395ad7559f94391984b4c1fd15540cc84e (diff) | |
| download | mediapointer-dvb-s2-28112395096dc4e16c80176a29ee15dad1706bc6.tar.gz mediapointer-dvb-s2-28112395096dc4e16c80176a29ee15dad1706bc6.tar.bz2 | |
backport commit aa82661baf8a48379355ffa8bf162b07cf487600
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Author: Greg Kroah-Hartman <gregkh@suse.de>
USB: remove warn() macro from usb media drivers
USB should not be having it's own printk macros, so remove warn() and
use the system-wide standard of dev_warn() wherever possible. In the
few places that will not work out, use a basic printk().
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/radio')
| -rw-r--r-- | linux/drivers/media/radio/dsbr100.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/linux/drivers/media/radio/dsbr100.c b/linux/drivers/media/radio/dsbr100.c index 71836beea..752478fad 100644 --- a/linux/drivers/media/radio/dsbr100.c +++ b/linux/drivers/media/radio/dsbr100.c @@ -311,7 +311,7 @@ static int vidioc_s_frequency(struct file *file, void *priv, radio->curfreq = f->frequency; if (dsbr100_setfreq(radio, radio->curfreq) == -1) - warn("Set frequency failed"); + dev_warn(&radio->usbdev->dev, "Set frequency failed\n"); return 0; } @@ -361,12 +361,14 @@ static int vidioc_s_ctrl(struct file *file, void *priv, case V4L2_CID_AUDIO_MUTE: if (ctrl->value) { if (dsbr100_stop(radio) == -1) { - warn("Radio did not respond properly"); + dev_warn(&radio->usbdev->dev, + "Radio did not respond properly\n"); return -EBUSY; } } else { if (dsbr100_start(radio) == -1) { - warn("Radio did not respond properly"); + dev_warn(&radio->usbdev->dev, + "Radio did not respond properly\n"); return -EBUSY; } } @@ -417,7 +419,8 @@ static int usb_dsbr100_open(struct inode *inode, struct file *file) radio->muted = 1; if (dsbr100_start(radio) < 0) { - warn("Radio did not start up properly"); + dev_warn(&radio->usbdev->dev, + "Radio did not start up properly\n"); radio->users = 0; unlock_kernel(); return -EIO; @@ -514,7 +517,7 @@ static int usb_dsbr100_probe(struct usb_interface *intf, radio->curfreq = FREQ_MIN * FREQ_MUL; video_set_drvdata(radio->videodev, radio); if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr) < 0) { - warn("Could not register video device"); + dev_warn(&intf->dev, "Could not register video device\n"); video_device_release(radio->videodev); kfree(radio->transfer_buffer); kfree(radio); |