diff options
author | Joe Perches <joe@perches.com> | 2011-08-21 18:56:57 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-04 10:06:05 -0400 |
commit | 133a9fe949862d9ed8411fb423739f4cee08232d (patch) | |
tree | 4a465a6823412503b73ef0462e3ffad3415fab39 /drivers/media/video/gspca/mars.c | |
parent | 42f4e774a30d0e9894741b62af4174c73ecc53da (diff) |
[media] gspca: Use current logging styles
Add pr_fmt.
Convert usb style logging macros to pr_<level>.
Remove now unused old usb style logging macros.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/mars.c')
-rw-r--r-- | drivers/media/video/gspca/mars.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c index 0196209a948a..ef45fa575752 100644 --- a/drivers/media/video/gspca/mars.c +++ b/drivers/media/video/gspca/mars.c | |||
@@ -19,6 +19,8 @@ | |||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
23 | |||
22 | #define MODULE_NAME "mars" | 24 | #define MODULE_NAME "mars" |
23 | 25 | ||
24 | #include "gspca.h" | 26 | #include "gspca.h" |
@@ -178,8 +180,8 @@ static void reg_w(struct gspca_dev *gspca_dev, | |||
178 | &alen, | 180 | &alen, |
179 | 500); /* timeout in milliseconds */ | 181 | 500); /* timeout in milliseconds */ |
180 | if (ret < 0) { | 182 | if (ret < 0) { |
181 | err("reg write [%02x] error %d", | 183 | pr_err("reg write [%02x] error %d\n", |
182 | gspca_dev->usb_buf[0], ret); | 184 | gspca_dev->usb_buf[0], ret); |
183 | gspca_dev->usb_err = ret; | 185 | gspca_dev->usb_err = ret; |
184 | } | 186 | } |
185 | } | 187 | } |