UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] t613: Use current logging styles 

Add pr_fmt.
Convert usb style logging macros to pr_<level>.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Joe Perches 2011-08-21 19:56:56 -03:00 committed by Mauro Carvalho Chehab
parent 91f5842b32
commit 1b19e42952
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/video/gspca/t613.c
View File

@ -26,6 +26,8 @@
* Costantino Leandro * Costantino Leandro
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#define MODULE_NAME "t613" #define MODULE_NAME "t613"
#include <linux/slab.h> #include <linux/slab.h>
@ -572,7 +574,7 @@ static void reg_w_buf(struct gspca_dev *gspca_dev,
tmpbuf = kmemdup(buffer, len, GFP_KERNEL); tmpbuf = kmemdup(buffer, len, GFP_KERNEL);
if (!tmpbuf) { if (!tmpbuf) {
err("Out of memory"); pr_err("Out of memory\n");
return; return;
} }
usb_control_msg(gspca_dev->dev, usb_control_msg(gspca_dev->dev,
@ -598,7 +600,7 @@ static void reg_w_ixbuf(struct gspca_dev *gspca_dev,
} else { } else {
p = tmpbuf = kmalloc(len * 2, GFP_KERNEL); p = tmpbuf = kmalloc(len * 2, GFP_KERNEL);
if (!tmpbuf) { if (!tmpbuf) {
err("Out of memory"); pr_err("Out of memory\n");
return; return;
} }
} }
@ -652,7 +654,7 @@ static void om6802_sensor_init(struct gspca_dev *gspca_dev)
} }
byte = reg_r(gspca_dev, 0x0063); byte = reg_r(gspca_dev, 0x0063);
if (byte != 0x17) { if (byte != 0x17) {
err("Bad sensor reset %02x", byte); pr_err("Bad sensor reset %02x\n", byte);
/* continue? */ /* continue? */
} }
@ -890,7 +892,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
sd->sensor = SENSOR_OM6802; sd->sensor = SENSOR_OM6802;
break; break;
default: default:
err("unknown sensor %04x", sensor_id); pr_err("unknown sensor %04x\n", sensor_id);
return -EINVAL; return -EINVAL;
} }
@ -905,7 +907,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
break; /* OK */ break; /* OK */
} }
if (i < 0) { if (i < 0) {
err("Bad sensor reset %02x", test_byte); pr_err("Bad sensor reset %02x\n", test_byte);
return -EIO; return -EIO;
} }
reg_w_buf(gspca_dev, n2, sizeof n2); reg_w_buf(gspca_dev, n2, sizeof n2);