aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-08-21 18:56:53 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-03 20:13:08 -0400
commit70a429954799bbf71f87abf12aaa35bf52cd9913 (patch)
tree1dfff68e0891a93c518a1db3304d1a1385961c1e /drivers/media/video/gspca
parentbdfe91f411bd05392952efc1afdce8bda1923517 (diff)
[media] finepix: 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>
Diffstat (limited to 'drivers/media/video/gspca')
-rw-r--r--drivers/media/video/gspca/finepix.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c
index 987b4b69d7ab..ea48200fd3a0 100644
--- a/drivers/media/video/gspca/finepix.c
+++ b/drivers/media/video/gspca/finepix.c
@@ -18,6 +18,8 @@
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 */ 19 */
20 20
21#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
22
21#define MODULE_NAME "finepix" 23#define MODULE_NAME "finepix"
22 24
23#include "gspca.h" 25#include "gspca.h"
@@ -182,7 +184,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
182 /* Init the device */ 184 /* Init the device */
183 ret = command(gspca_dev, 0); 185 ret = command(gspca_dev, 0);
184 if (ret < 0) { 186 if (ret < 0) {
185 err("init failed %d", ret); 187 pr_err("init failed %d\n", ret);
186 return ret; 188 return ret;
187 } 189 }
188 190
@@ -194,14 +196,14 @@ static int sd_start(struct gspca_dev *gspca_dev)
194 FPIX_MAX_TRANSFER, &len, 196 FPIX_MAX_TRANSFER, &len,
195 FPIX_TIMEOUT); 197 FPIX_TIMEOUT);
196 if (ret < 0) { 198 if (ret < 0) {
197 err("usb_bulk_msg failed %d", ret); 199 pr_err("usb_bulk_msg failed %d\n", ret);
198 return ret; 200 return ret;
199 } 201 }
200 202
201 /* Request a frame, but don't read it */ 203 /* Request a frame, but don't read it */
202 ret = command(gspca_dev, 1); 204 ret = command(gspca_dev, 1);
203 if (ret < 0) { 205 if (ret < 0) {
204 err("frame request failed %d", ret); 206 pr_err("frame request failed %d\n", ret);
205 return ret; 207 return ret;
206 } 208 }
207 209