Skip to content

Commit

Permalink
[media] gspca: 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>.
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>
  • Loading branch information
Joe Perches authored and Mauro Carvalho Chehab committed Sep 4, 2011
1 parent 42f4e77 commit 133a9fe
Show file tree
Hide file tree
Showing 42 changed files with 338 additions and 266 deletions.
18 changes: 10 additions & 8 deletions drivers/media/video/gspca/benq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define MODULE_NAME "benq"

#include "gspca.h"
Expand Down Expand Up @@ -62,7 +64,7 @@ static void reg_w(struct gspca_dev *gspca_dev,
0,
500);
if (ret < 0) {
err("reg_w err %d", ret);
pr_err("reg_w err %d\n", ret);
gspca_dev->usb_err = ret;
}
}
Expand Down Expand Up @@ -91,7 +93,7 @@ static int sd_isoc_init(struct gspca_dev *gspca_dev)
ret = usb_set_interface(gspca_dev->dev, gspca_dev->iface,
gspca_dev->nbalt - 1);
if (ret < 0) {
err("usb_set_interface failed");
pr_err("usb_set_interface failed\n");
return ret;
}
/* reg_w(gspca_dev, 0x0003, 0x0002); */
Expand All @@ -113,7 +115,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
for (n = 0; n < 4; n++) {
urb = usb_alloc_urb(SD_NPKT, GFP_KERNEL);
if (!urb) {
err("usb_alloc_urb failed");
pr_err("usb_alloc_urb failed\n");
return -ENOMEM;
}
gspca_dev->urb[n] = urb;
Expand All @@ -123,7 +125,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
&urb->transfer_dma);

if (urb->transfer_buffer == NULL) {
err("usb_alloc_coherent failed");
pr_err("usb_alloc_coherent failed\n");
return -ENOMEM;
}
urb->dev = gspca_dev->dev;
Expand Down Expand Up @@ -181,7 +183,7 @@ static void sd_isoc_irq(struct urb *urb)
if (gspca_dev->frozen)
return;
#endif
err("urb status: %d", urb->status);
pr_err("urb status: %d\n", urb->status);
return;
}

Expand Down Expand Up @@ -209,7 +211,7 @@ static void sd_isoc_irq(struct urb *urb)
if (st == 0)
st = urb->iso_frame_desc[i].status;
if (st) {
err("ISOC data error: [%d] status=%d",
pr_err("ISOC data error: [%d] status=%d\n",
i, st);
gspca_dev->last_packet_type = DISCARD_PACKET;
continue;
Expand Down Expand Up @@ -256,10 +258,10 @@ static void sd_isoc_irq(struct urb *urb)
/* resubmit the URBs */
st = usb_submit_urb(urb0, GFP_ATOMIC);
if (st < 0)
err("usb_submit_urb(0) ret %d", st);
pr_err("usb_submit_urb(0) ret %d\n", st);
st = usb_submit_urb(urb, GFP_ATOMIC);
if (st < 0)
err("usb_submit_urb() ret %d", st);
pr_err("usb_submit_urb() ret %d\n", st);
}

/* sub-driver description */
Expand Down
6 changes: 4 additions & 2 deletions drivers/media/video/gspca/conex.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define MODULE_NAME "conex"

#include "gspca.h"
Expand Down Expand Up @@ -129,7 +131,7 @@ static void reg_r(struct gspca_dev *gspca_dev,

#ifdef GSPCA_DEBUG
if (len > USB_BUF_SZ) {
err("reg_r: buffer overflow");
pr_err("reg_r: buffer overflow\n");
return;
}
#endif
Expand Down Expand Up @@ -169,7 +171,7 @@ static void reg_w(struct gspca_dev *gspca_dev,

#ifdef GSPCA_DEBUG
if (len > USB_BUF_SZ) {
err("reg_w: buffer overflow");
pr_err("reg_w: buffer overflow\n");
return;
}
PDEBUG(D_USBO, "reg write [%02x] = %02x..", index, *buffer);
Expand Down
7 changes: 4 additions & 3 deletions drivers/media/video/gspca/cpia1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
*
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define MODULE_NAME "cpia1"

#include <linux/input.h>
Expand Down Expand Up @@ -550,8 +552,7 @@ static int cpia_usb_transferCmd(struct gspca_dev *gspca_dev, u8 *command)
gspca_dev->usb_buf, databytes, 1000);

if (ret < 0)
err("usb_control_msg %02x, error %d", command[1],
ret);
pr_err("usb_control_msg %02x, error %d\n", command[1], ret);

if (ret == -EPIPE && retries > 0) {
retries--;
Expand Down Expand Up @@ -1279,7 +1280,7 @@ static void monitor_exposure(struct gspca_dev *gspca_dev)
cmd[7] = 0;
ret = cpia_usb_transferCmd(gspca_dev, cmd);
if (ret) {
err("ReadVPRegs(30,4,9,8) - failed: %d", ret);
pr_err("ReadVPRegs(30,4,9,8) - failed: %d\n", ret);
return;
}
exp_acc = gspca_dev->usb_buf[0];
Expand Down
6 changes: 4 additions & 2 deletions drivers/media/video/gspca/etoms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define MODULE_NAME "etoms"

#include "gspca.h"
Expand Down Expand Up @@ -236,7 +238,7 @@ static void reg_r(struct gspca_dev *gspca_dev,

#ifdef GSPCA_DEBUG
if (len > USB_BUF_SZ) {
err("reg_r: buffer overflow");
pr_err("reg_r: buffer overflow\n");
return;
}
#endif
Expand Down Expand Up @@ -274,7 +276,7 @@ static void reg_w(struct gspca_dev *gspca_dev,

#ifdef GSPCA_DEBUG
if (len > USB_BUF_SZ) {
err("reg_w: buffer overflow");
pr_err("reg_w: buffer overflow\n");
return;
}
PDEBUG(D_USBO, "reg write [%02x] = %02x..", index, *buffer);
Expand Down
46 changes: 24 additions & 22 deletions drivers/media/video/gspca/gspca.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
* Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define MODULE_NAME "gspca"

#include <linux/init.h>
Expand Down Expand Up @@ -148,7 +150,7 @@ static void int_irq(struct urb *urb)
if (ret == 0) {
ret = usb_submit_urb(urb, GFP_ATOMIC);
if (ret < 0)
err("Resubmit URB failed with error %i", ret);
pr_err("Resubmit URB failed with error %i\n", ret);
}
}

Expand Down Expand Up @@ -177,8 +179,8 @@ static int gspca_input_connect(struct gspca_dev *dev)

err = input_register_device(input_dev);
if (err) {
err("Input device registration failed with error %i",
err);
pr_err("Input device registration failed with error %i\n",
err);
input_dev->dev.parent = NULL;
input_free_device(input_dev);
} else {
Expand Down Expand Up @@ -323,8 +325,8 @@ static void fill_frame(struct gspca_dev *gspca_dev,
/* check the packet status and length */
st = urb->iso_frame_desc[i].status;
if (st) {
err("ISOC data error: [%d] len=%d, status=%d",
i, len, st);
pr_err("ISOC data error: [%d] len=%d, status=%d\n",
i, len, st);
gspca_dev->last_packet_type = DISCARD_PACKET;
continue;
}
Expand All @@ -346,7 +348,7 @@ static void fill_frame(struct gspca_dev *gspca_dev,
/* resubmit the URB */
st = usb_submit_urb(urb, GFP_ATOMIC);
if (st < 0)
err("usb_submit_urb() ret %d", st);
pr_err("usb_submit_urb() ret %d\n", st);
}

/*
Expand Down Expand Up @@ -400,7 +402,7 @@ static void bulk_irq(struct urb *urb)
if (gspca_dev->cam.bulk_nurbs != 0) {
st = usb_submit_urb(urb, GFP_ATOMIC);
if (st < 0)
err("usb_submit_urb() ret %d", st);
pr_err("usb_submit_urb() ret %d\n", st);
}
}

Expand Down Expand Up @@ -464,7 +466,7 @@ void gspca_frame_add(struct gspca_dev *gspca_dev,
} else {
/* !! image is NULL only when last pkt is LAST or DISCARD
if (gspca_dev->image == NULL) {
err("gspca_frame_add() image == NULL");
pr_err("gspca_frame_add() image == NULL\n");
return;
}
*/
Expand Down Expand Up @@ -525,7 +527,7 @@ static int frame_alloc(struct gspca_dev *gspca_dev, struct file *file,
count = GSPCA_MAX_FRAMES - 1;
gspca_dev->frbuf = vmalloc_32(frsz * count);
if (!gspca_dev->frbuf) {
err("frame alloc failed");
pr_err("frame alloc failed\n");
return -ENOMEM;
}
gspca_dev->capt_file = file;
Expand Down Expand Up @@ -597,7 +599,7 @@ static int gspca_set_alt0(struct gspca_dev *gspca_dev)
return 0;
ret = usb_set_interface(gspca_dev->dev, gspca_dev->iface, 0);
if (ret < 0)
err("set alt 0 err %d", ret);
pr_err("set alt 0 err %d\n", ret);
return ret;
}

Expand Down Expand Up @@ -673,7 +675,7 @@ static struct usb_host_endpoint *get_ep(struct gspca_dev *gspca_dev)
}
}
if (ep == NULL) {
err("no transfer endpoint found");
pr_err("no transfer endpoint found\n");
return NULL;
}
PDEBUG(D_STREAM, "use alt %d ep 0x%02x",
Expand All @@ -682,7 +684,7 @@ static struct usb_host_endpoint *get_ep(struct gspca_dev *gspca_dev)
if (gspca_dev->nbalt > 1) {
ret = usb_set_interface(gspca_dev->dev, gspca_dev->iface, i);
if (ret < 0) {
err("set alt %d err %d", i, ret);
pr_err("set alt %d err %d\n", i, ret);
ep = NULL;
}
}
Expand Down Expand Up @@ -731,7 +733,7 @@ static int create_urbs(struct gspca_dev *gspca_dev,
for (n = 0; n < nurbs; n++) {
urb = usb_alloc_urb(npkt, GFP_KERNEL);
if (!urb) {
err("usb_alloc_urb failed");
pr_err("usb_alloc_urb failed\n");
return -ENOMEM;
}
gspca_dev->urb[n] = urb;
Expand All @@ -741,7 +743,7 @@ static int create_urbs(struct gspca_dev *gspca_dev,
&urb->transfer_dma);

if (urb->transfer_buffer == NULL) {
err("usb_alloc_coherent failed");
pr_err("usb_alloc_coherent failed\n");
return -ENOMEM;
}
urb->dev = gspca_dev->dev;
Expand Down Expand Up @@ -854,8 +856,8 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
break;
gspca_stream_off(gspca_dev);
if (ret != -ENOSPC) {
err("usb_submit_urb alt %d err %d",
gspca_dev->alt, ret);
pr_err("usb_submit_urb alt %d err %d\n",
gspca_dev->alt, ret);
goto out;
}

Expand Down Expand Up @@ -2202,12 +2204,12 @@ int gspca_dev_probe2(struct usb_interface *intf,
dev_size = sizeof *gspca_dev;
gspca_dev = kzalloc(dev_size, GFP_KERNEL);
if (!gspca_dev) {
err("couldn't kzalloc gspca struct");
pr_err("couldn't kzalloc gspca struct\n");
return -ENOMEM;
}
gspca_dev->usb_buf = kmalloc(USB_BUF_SZ, GFP_KERNEL);
if (!gspca_dev->usb_buf) {
err("out of memory");
pr_err("out of memory\n");
ret = -ENOMEM;
goto out;
}
Expand Down Expand Up @@ -2264,7 +2266,7 @@ int gspca_dev_probe2(struct usb_interface *intf,
VFL_TYPE_GRABBER,
-1);
if (ret < 0) {
err("video_register_device err %d", ret);
pr_err("video_register_device err %d\n", ret);
goto out;
}

Expand Down Expand Up @@ -2296,8 +2298,8 @@ int gspca_dev_probe(struct usb_interface *intf,

/* we don't handle multi-config cameras */
if (dev->descriptor.bNumConfigurations != 1) {
err("%04x:%04x too many config",
id->idVendor, id->idProduct);
pr_err("%04x:%04x too many config\n",
id->idVendor, id->idProduct);
return -ENODEV;
}

Expand Down Expand Up @@ -2480,7 +2482,7 @@ EXPORT_SYMBOL(gspca_auto_gain_n_exposure);
/* -- module insert / remove -- */
static int __init gspca_init(void)
{
info("v" DRIVER_VERSION_NUMBER " registered");
pr_info("v" DRIVER_VERSION_NUMBER " registered\n");
return 0;
}
static void __exit gspca_exit(void)
Expand Down
22 changes: 7 additions & 15 deletions drivers/media/video/gspca/gspca.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@
#ifdef GSPCA_DEBUG
/* GSPCA our debug messages */
extern int gspca_debug;
#define PDEBUG(level, fmt, args...) \
do {\
if (gspca_debug & (level)) \
printk(KERN_INFO MODULE_NAME ": " fmt "\n", ## args); \
} while (0)
#define PDEBUG(level, fmt, ...) \
do { \
if (gspca_debug & (level)) \
pr_info(fmt, ##__VA_ARGS__); \
} while (0)

#define D_ERR 0x01
#define D_PROBE 0x02
#define D_CONF 0x04
Expand All @@ -29,17 +30,8 @@ extern int gspca_debug;
#define D_USBO 0x00
#define D_V4L2 0x0100
#else
#define PDEBUG(level, fmt, args...)
#define PDEBUG(level, fmt, ...)
#endif
#undef err
#define err(fmt, args...) \
printk(KERN_ERR MODULE_NAME ": " fmt "\n", ## args)
#undef info
#define info(fmt, args...) \
printk(KERN_INFO MODULE_NAME ": " fmt "\n", ## args)
#undef warn
#define warn(fmt, args...) \
printk(KERN_WARNING MODULE_NAME ": " fmt "\n", ## args)

#define GSPCA_MAX_FRAMES 16 /* maximum number of video frame buffers */
/* image transfers */
Expand Down
Loading

0 comments on commit 133a9fe

Please sign in to comment.