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/video/usbvideo/quickcam_messenger.c | |
| 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/video/usbvideo/quickcam_messenger.c')
| -rw-r--r-- | linux/drivers/media/video/usbvideo/quickcam_messenger.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/linux/drivers/media/video/usbvideo/quickcam_messenger.c b/linux/drivers/media/video/usbvideo/quickcam_messenger.c index 2f7274aba..d363e3d64 100644 --- a/linux/drivers/media/video/usbvideo/quickcam_messenger.c +++ b/linux/drivers/media/video/usbvideo/quickcam_messenger.c @@ -98,7 +98,7 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev) cam->input = input_dev = input_allocate_device(); if (!input_dev) { - warn("insufficient mem for cam input device"); + dev_warn(&dev->dev, "insufficient mem for cam input device\n"); return; } @@ -116,8 +116,9 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev) error = input_register_device(cam->input); if (error) { - warn("Failed to register camera's input device, err: %d\n", - error); + dev_warn(&dev->dev, + "Failed to register camera's input device, err: %d\n", + error); input_free_device(cam->input); cam->input = NULL; } @@ -600,8 +601,9 @@ static int qcm_compress_iso(struct uvd *uvd, struct urb *dataurb) dataurb->iso_frame_desc[i].offset; if (st < 0) { - warn("Data error: packet=%d. len=%d. status=%d.", - i, n, st); + dev_warn(&uvd->dev->dev, + "Data error: packet=%d. len=%d. status=%d.\n", + i, n, st); uvd->stats.iso_err_count++; continue; } @@ -716,7 +718,7 @@ static void qcm_stop_data(struct uvd *uvd) ret = qcm_camera_off(uvd); if (ret) - warn("couldn't turn the cam off."); + dev_warn(&uvd->dev->dev, "couldn't turn the cam off.\n"); uvd->streaming = 0; |