diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2009-01-08 07:13:42 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:26 -0400 |
commit | be9ed5117d95cdc4e601f9da220ebeaaab131679 (patch) | |
tree | 9dc12b47951ded56ec654c579253e07514360fd2 /drivers/media/video/pvrusb2 | |
parent | f180152376c984a6faa9decb8f2811c373da9141 (diff) |
V4L/DVB (10298): remove err macro from few usb devices
Patch removes err() macros from few usb devices.
It places pr_err in pvrusb2-v4l2.c, dev_err in dabusb and in usbvision
drivers. Beside placing dev_err, patch defines new s2255_dev_err macro
with S2255_DRIVER_NAME in s2255 module.
Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
Acked-by: Thierry Merle <thierry.merle@free.fr>
Acked-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pvrusb2')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 3163c6df448a..b7caf135ed55 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |||
@@ -1268,8 +1268,9 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, | |||
1268 | dip->minor_type = pvr2_v4l_type_video; | 1268 | dip->minor_type = pvr2_v4l_type_video; |
1269 | nr_ptr = video_nr; | 1269 | nr_ptr = video_nr; |
1270 | if (!dip->stream) { | 1270 | if (!dip->stream) { |
1271 | err("Failed to set up pvrusb2 v4l video dev" | 1271 | pr_err(KBUILD_MODNAME |
1272 | " due to missing stream instance"); | 1272 | ": Failed to set up pvrusb2 v4l video dev" |
1273 | " due to missing stream instance\n"); | ||
1273 | return; | 1274 | return; |
1274 | } | 1275 | } |
1275 | break; | 1276 | break; |
@@ -1286,8 +1287,8 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, | |||
1286 | break; | 1287 | break; |
1287 | default: | 1288 | default: |
1288 | /* Bail out (this should be impossible) */ | 1289 | /* Bail out (this should be impossible) */ |
1289 | err("Failed to set up pvrusb2 v4l dev" | 1290 | pr_err(KBUILD_MODNAME ": Failed to set up pvrusb2 v4l dev" |
1290 | " due to unrecognized config"); | 1291 | " due to unrecognized config\n"); |
1291 | return; | 1292 | return; |
1292 | } | 1293 | } |
1293 | 1294 | ||
@@ -1303,7 +1304,8 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, | |||
1303 | dip->v4l_type, mindevnum) < 0) && | 1304 | dip->v4l_type, mindevnum) < 0) && |
1304 | (video_register_device(&dip->devbase, | 1305 | (video_register_device(&dip->devbase, |
1305 | dip->v4l_type, -1) < 0)) { | 1306 | dip->v4l_type, -1) < 0)) { |
1306 | err("Failed to register pvrusb2 v4l device"); | 1307 | pr_err(KBUILD_MODNAME |
1308 | ": Failed to register pvrusb2 v4l device\n"); | ||
1307 | } | 1309 | } |
1308 | 1310 | ||
1309 | printk(KERN_INFO "pvrusb2: registered device %s%u [%s]\n", | 1311 | printk(KERN_INFO "pvrusb2: registered device %s%u [%s]\n", |