diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-14 12:37:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 17:41:08 -0400 |
commit | aa82661baf8a48379355ffa8bf162b07cf487600 (patch) | |
tree | 22b555a5227c2d6f3a145d5a5350b2b473602262 /drivers/media/video/usbvideo/konicawc.c | |
parent | 1817b1692a2eab022e805d32e910f4556c89dce8 (diff) |
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().
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/media/video/usbvideo/konicawc.c')
-rw-r--r-- | drivers/media/video/usbvideo/konicawc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c index e986c28b7bb..da27a528798 100644 --- a/drivers/media/video/usbvideo/konicawc.c +++ b/drivers/media/video/usbvideo/konicawc.c | |||
@@ -229,7 +229,8 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev | |||
229 | 229 | ||
230 | cam->input = input_dev = input_allocate_device(); | 230 | cam->input = input_dev = input_allocate_device(); |
231 | if (!input_dev) { | 231 | if (!input_dev) { |
232 | warn("Not enough memory for camera's input device\n"); | 232 | dev_warn(&dev->dev, |
233 | "Not enough memory for camera's input device\n"); | ||
233 | return; | 234 | return; |
234 | } | 235 | } |
235 | 236 | ||
@@ -243,8 +244,9 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev | |||
243 | 244 | ||
244 | error = input_register_device(cam->input); | 245 | error = input_register_device(cam->input); |
245 | if (error) { | 246 | if (error) { |
246 | warn("Failed to register camera's input device, err: %d\n", | 247 | dev_warn(&dev->dev, |
247 | error); | 248 | "Failed to register camera's input device, err: %d\n", |
249 | error); | ||
248 | input_free_device(cam->input); | 250 | input_free_device(cam->input); |
249 | cam->input = NULL; | 251 | cam->input = NULL; |
250 | } | 252 | } |