diff options
author | Joe Perches <joe@perches.com> | 2011-08-21 18:56:54 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-03 20:13:21 -0400 |
commit | be612514c0f9d543d3689111755e1aa6a008e88f (patch) | |
tree | 3bcbc59fe19ffe9778b9c19d6aaeba5cb2169c37 /drivers/media/video/gspca | |
parent | 70a429954799bbf71f87abf12aaa35bf52cd9913 (diff) |
[media] pac207: Use current logging styles
Add pr_fmt.
Convert usb style logging macros to pr_<level>.
Coalesce formats.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca')
-rw-r--r-- | drivers/media/video/gspca/pac207.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c index 81739a2f205e..1600df152fd6 100644 --- a/drivers/media/video/gspca/pac207.c +++ b/drivers/media/video/gspca/pac207.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
27 | |||
26 | #define MODULE_NAME "pac207" | 28 | #define MODULE_NAME "pac207" |
27 | 29 | ||
28 | #include <linux/input.h> | 30 | #include <linux/input.h> |
@@ -178,8 +180,8 @@ static int pac207_write_regs(struct gspca_dev *gspca_dev, u16 index, | |||
178 | 0x00, index, | 180 | 0x00, index, |
179 | gspca_dev->usb_buf, length, PAC207_CTRL_TIMEOUT); | 181 | gspca_dev->usb_buf, length, PAC207_CTRL_TIMEOUT); |
180 | if (err < 0) | 182 | if (err < 0) |
181 | err("Failed to write registers to index 0x%04X, error %d)", | 183 | pr_err("Failed to write registers to index 0x%04X, error %d\n", |
182 | index, err); | 184 | index, err); |
183 | 185 | ||
184 | return err; | 186 | return err; |
185 | } | 187 | } |
@@ -194,8 +196,8 @@ static int pac207_write_reg(struct gspca_dev *gspca_dev, u16 index, u16 value) | |||
194 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE, | 196 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE, |
195 | value, index, NULL, 0, PAC207_CTRL_TIMEOUT); | 197 | value, index, NULL, 0, PAC207_CTRL_TIMEOUT); |
196 | if (err) | 198 | if (err) |
197 | err("Failed to write a register (index 0x%04X," | 199 | pr_err("Failed to write a register (index 0x%04X, value 0x%02X, error %d)\n", |
198 | " value 0x%02X, error %d)", index, value, err); | 200 | index, value, err); |
199 | 201 | ||
200 | return err; | 202 | return err; |
201 | } | 203 | } |
@@ -210,8 +212,8 @@ static int pac207_read_reg(struct gspca_dev *gspca_dev, u16 index) | |||
210 | 0x00, index, | 212 | 0x00, index, |
211 | gspca_dev->usb_buf, 1, PAC207_CTRL_TIMEOUT); | 213 | gspca_dev->usb_buf, 1, PAC207_CTRL_TIMEOUT); |
212 | if (res < 0) { | 214 | if (res < 0) { |
213 | err("Failed to read a register (index 0x%04X, error %d)", | 215 | pr_err("Failed to read a register (index 0x%04X, error %d)\n", |
214 | index, res); | 216 | index, res); |
215 | return res; | 217 | return res; |
216 | } | 218 | } |
217 | 219 | ||