Skip to content

Commit

Permalink
[media] t613: Use current logging styles
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Joe Perches authored and Mauro Carvalho Chehab committed Sep 4, 2011
1 parent 91f5842 commit 1b19e42
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions drivers/media/video/gspca/t613.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
* Costantino Leandro
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define MODULE_NAME "t613"

#include <linux/slab.h>
Expand Down Expand Up @@ -572,7 +574,7 @@ static void reg_w_buf(struct gspca_dev *gspca_dev,

tmpbuf = kmemdup(buffer, len, GFP_KERNEL);
if (!tmpbuf) {
err("Out of memory");
pr_err("Out of memory\n");
return;
}
usb_control_msg(gspca_dev->dev,
Expand All @@ -598,7 +600,7 @@ static void reg_w_ixbuf(struct gspca_dev *gspca_dev,
} else {
p = tmpbuf = kmalloc(len * 2, GFP_KERNEL);
if (!tmpbuf) {
err("Out of memory");
pr_err("Out of memory\n");
return;
}
}
Expand Down Expand Up @@ -652,7 +654,7 @@ static void om6802_sensor_init(struct gspca_dev *gspca_dev)
}
byte = reg_r(gspca_dev, 0x0063);
if (byte != 0x17) {
err("Bad sensor reset %02x", byte);
pr_err("Bad sensor reset %02x\n", byte);
/* continue? */
}

Expand Down Expand Up @@ -890,7 +892,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
sd->sensor = SENSOR_OM6802;
break;
default:
err("unknown sensor %04x", sensor_id);
pr_err("unknown sensor %04x\n", sensor_id);
return -EINVAL;
}

Expand All @@ -905,7 +907,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
break; /* OK */
}
if (i < 0) {
err("Bad sensor reset %02x", test_byte);
pr_err("Bad sensor reset %02x\n", test_byte);
return -EIO;
}
reg_w_buf(gspca_dev, n2, sizeof n2);
Expand Down

0 comments on commit 1b19e42

Please sign in to comment.