[media] gspca: Use current logging styles (133a9fe9) · Commits · e / devices / android_kernel_teracube_2e

drivers/media/video/gspca/benq.c

+10 −8

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,8 @@
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*/		*/

			#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

	#define MODULE_NAME "benq"		#define MODULE_NAME "benq"

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

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

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

	/* sub-driver description */		/* sub-driver description */

drivers/media/video/gspca/conex.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,8 @@
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*/		*/

			#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

	#define MODULE_NAME "conex"		#define MODULE_NAME "conex"

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

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

	#ifdef GSPCA_DEBUG		#ifdef GSPCA_DEBUG
	if (len > USB_BUF_SZ) {		if (len > USB_BUF_SZ) {
	err("reg_w: buffer overflow");		pr_err("reg_w: buffer overflow\n");
	return;		return;
	}		}
	PDEBUG(D_USBO, "reg write [%02x] = %02x..", index, *buffer);		PDEBUG(D_USBO, "reg write [%02x] = %02x..", index, *buffer);

drivers/media/video/gspca/cpia1.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,8 @@
	*		*
	*/		*/

			#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

	#define MODULE_NAME "cpia1"		#define MODULE_NAME "cpia1"

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

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

	if (ret == -EPIPE && retries > 0) {		if (ret == -EPIPE && retries > 0) {
	retries--;		retries--;
	@@ -1279,7 +1280,7 @@ static void monitor_exposure(struct gspca_dev *gspca_dev)
	cmd[7] = 0;		cmd[7] = 0;
	ret = cpia_usb_transferCmd(gspca_dev, cmd);		ret = cpia_usb_transferCmd(gspca_dev, cmd);
	if (ret) {		if (ret) {
	err("ReadVPRegs(30,4,9,8) - failed: %d", ret);		pr_err("ReadVPRegs(30,4,9,8) - failed: %d\n", ret);
	return;		return;
	}		}
	exp_acc = gspca_dev->usb_buf[0];		exp_acc = gspca_dev->usb_buf[0];

drivers/media/video/gspca/etoms.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,8 @@
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*/		*/

			#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

	#define MODULE_NAME "etoms"		#define MODULE_NAME "etoms"

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

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

	#ifdef GSPCA_DEBUG		#ifdef GSPCA_DEBUG
	if (len > USB_BUF_SZ) {		if (len > USB_BUF_SZ) {
	err("reg_w: buffer overflow");		pr_err("reg_w: buffer overflow\n");
	return;		return;
	}		}
	PDEBUG(D_USBO, "reg write [%02x] = %02x..", index, *buffer);		PDEBUG(D_USBO, "reg write [%02x] = %02x..", index, *buffer);

drivers/media/video/gspca/gspca.c

+24 −22

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,8 @@
	* Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		* Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
	*/		*/

			#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

	#define MODULE_NAME "gspca"		#define MODULE_NAME "gspca"

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

	@@ -177,7 +179,7 @@ static int gspca_input_connect(struct gspca_dev *dev)

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

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

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

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

	if (urb->transfer_buffer == NULL) {		if (urb->transfer_buffer == NULL) {
	err("usb_alloc_coherent failed");		pr_err("usb_alloc_coherent failed\n");
	return -ENOMEM;		return -ENOMEM;
	}		}
	urb->dev = gspca_dev->dev;		urb->dev = gspca_dev->dev;
	@@ -854,7 +856,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
	break;		break;
	gspca_stream_off(gspca_dev);		gspca_stream_off(gspca_dev);
	if (ret != -ENOSPC) {		if (ret != -ENOSPC) {
	err("usb_submit_urb alt %d err %d",		pr_err("usb_submit_urb alt %d err %d\n",
	gspca_dev->alt, ret);		gspca_dev->alt, ret);
	goto out;		goto out;
	}		}
	@@ -2202,12 +2204,12 @@ int gspca_dev_probe2(struct usb_interface *intf,
	dev_size = sizeof *gspca_dev;		dev_size = sizeof *gspca_dev;
	gspca_dev = kzalloc(dev_size, GFP_KERNEL);		gspca_dev = kzalloc(dev_size, GFP_KERNEL);
	if (!gspca_dev) {		if (!gspca_dev) {
	err("couldn't kzalloc gspca struct");		pr_err("couldn't kzalloc gspca struct\n");
	return -ENOMEM;		return -ENOMEM;
	}		}
	gspca_dev->usb_buf = kmalloc(USB_BUF_SZ, GFP_KERNEL);		gspca_dev->usb_buf = kmalloc(USB_BUF_SZ, GFP_KERNEL);
	if (!gspca_dev->usb_buf) {		if (!gspca_dev->usb_buf) {
	err("out of memory");		pr_err("out of memory\n");
	ret = -ENOMEM;		ret = -ENOMEM;
	goto out;		goto out;
	}		}
	@@ -2264,7 +2266,7 @@ int gspca_dev_probe2(struct usb_interface *intf,
	VFL_TYPE_GRABBER,		VFL_TYPE_GRABBER,
	-1);		-1);
	if (ret < 0) {		if (ret < 0) {
	err("video_register_device err %d", ret);		pr_err("video_register_device err %d\n", ret);
	goto out;		goto out;
	}		}

	@@ -2296,7 +2298,7 @@ int gspca_dev_probe(struct usb_interface *intf,

	/* we don't handle multi-config cameras */		/* we don't handle multi-config cameras */
	if (dev->descriptor.bNumConfigurations != 1) {		if (dev->descriptor.bNumConfigurations != 1) {
	err("%04x:%04x too many config",		pr_err("%04x:%04x too many config\n",
	id->idVendor, id->idProduct);		id->idVendor, id->idProduct);
	return -ENODEV;		return -ENODEV;
	}		}
	@@ -2480,7 +2482,7 @@ EXPORT_SYMBOL(gspca_auto_gain_n_exposure);
	/* -- module insert / remove -- */		/* -- module insert / remove -- */
	static int __init gspca_init(void)		static int __init gspca_init(void)
	{		{
	info("v" DRIVER_VERSION_NUMBER " registered");		pr_info("v" DRIVER_VERSION_NUMBER " registered\n");
	return 0;		return 0;
	}		}
	static void __exit gspca_exit(void)		static void __exit gspca_exit(void)