Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c93396e1 authored by Theodore Kilgore's avatar Theodore Kilgore Committed by Mauro Carvalho Chehab
Browse files

[media] gspca: Remove gspca-specific debug magic 



Instead use v4l2_dbg and v4l2_err. Note that the PDEBUG macro is kept to
make this patch-set less invasive, but it is simply a wrapper around
v4l2_dbg now. Most of the other changes are there to make the dev parameter
for the v4l2_xxx macros available everywhere we do logging.

Signed-off-by: default avatarTheodore Kilgore <kilgota@auburn.edu>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 70c8ecf5

drivers/media/usb/gspca/benq.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static void sd_isoc_irq(struct urb *urb) 
		/* check the packet status and length */

		if (urb0->iso_frame_desc[i].actual_length != SD_PKT_SZ

		    || urb->iso_frame_desc[i].actual_length != SD_PKT_SZ) {

			PDEBUG(D_ERR, "ISOC bad lengths %d / %d",

			PERR("ISOC bad lengths %d / %d",

				urb0->iso_frame_desc[i].actual_length,

				urb->iso_frame_desc[i].actual_length);

			gspca_dev->last_packet_type = DISCARD_PACKET;

drivers/media/usb/gspca/conex.c

+5 −7
Original line number Diff line number Diff line
@@ -73,12 +73,11 @@ static void reg_r(struct gspca_dev *gspca_dev, 
{

	struct usb_device *dev = gspca_dev->dev;



#ifdef GSPCA_DEBUG

	if (len > USB_BUF_SZ) {

		pr_err("reg_r: buffer overflow\n");

		PERR("reg_r: buffer overflow\n");

		return;

	}

#endif



	usb_control_msg(dev,

			usb_rcvctrlpipe(dev, 0),

			0,
@@ -113,13 +112,12 @@ static void reg_w(struct gspca_dev *gspca_dev, 
{

	struct usb_device *dev = gspca_dev->dev;



#ifdef GSPCA_DEBUG

	if (len > USB_BUF_SZ) {

		pr_err("reg_w: buffer overflow\n");

		PERR("reg_w: buffer overflow\n");

		return;

	}

	PDEBUG(D_USBO, "reg write [%02x] = %02x..", index, *buffer);

#endif



	memcpy(gspca_dev->usb_buf, buffer, len);

	usb_control_msg(dev,

			usb_sndctrlpipe(dev, 0),
@@ -689,7 +687,7 @@ static void cx11646_jpeg(struct gspca_dev*gspca_dev) 
		reg_w_val(gspca_dev, 0x0053, 0x00);

	} while (--retry);

	if (retry == 0)

		PDEBUG(D_ERR, "Damned Errors sending jpeg Table");

		PERR("Damned Errors sending jpeg Table");

	/* send the qtable now */

	reg_r(gspca_dev, 0x0001, 1);		/* -> 0x18 */

	length = 8;

drivers/media/usb/gspca/cpia1.c

+15 −18
Original line number Diff line number Diff line
@@ -421,8 +421,7 @@ static int cpia_usb_transferCmd(struct gspca_dev *gspca_dev, u8 *command) 
		pipe = usb_sndctrlpipe(gspca_dev->dev, 0);

		requesttype = USB_TYPE_VENDOR | USB_RECIP_DEVICE;

	} else {

		PDEBUG(D_ERR, "Unexpected first byte of command: %x",

		       command[0]);

		PERR("Unexpected first byte of command: %x", command[0]);

		return -EINVAL;

	}
@@ -701,7 +700,7 @@ static void reset_camera_params(struct gspca_dev *gspca_dev) 
	params->qx3.cradled = 0;

}



static void printstatus(struct cam_params *params)

static void printstatus(struct gspca_dev *gspca_dev, struct cam_params *params)

{

	PDEBUG(D_PROBE, "status: %02x %02x %02x %02x %02x %02x %02x %02x",

	       params->status.systemState, params->status.grabState,
@@ -725,10 +724,9 @@ static int goto_low_power(struct gspca_dev *gspca_dev) 


	if (sd->params.status.systemState != LO_POWER_STATE) {

		if (sd->params.status.systemState != WARM_BOOT_STATE) {

			PDEBUG(D_ERR,

			       "unexpected state after lo power cmd: %02x",

			PERR("unexpected state after lo power cmd: %02x",

			     sd->params.status.systemState);

			printstatus(&sd->params);

			printstatus(gspca_dev, &sd->params);

		}

		return -EIO;

	}
@@ -756,9 +754,9 @@ static int goto_high_power(struct gspca_dev *gspca_dev) 
		return ret;



	if (sd->params.status.systemState != HI_POWER_STATE) {

		PDEBUG(D_ERR, "unexpected state after hi power cmd: %02x",

		PERR("unexpected state after hi power cmd: %02x",

		     sd->params.status.systemState);

		printstatus(&sd->params);

		printstatus(gspca_dev, &sd->params);

		return -EIO;

	}
@@ -1449,7 +1447,7 @@ static int sd_config(struct gspca_dev *gspca_dev, 
	sd->params.version.firmwareVersion = 0;

	get_version_information(gspca_dev);

	if (sd->params.version.firmwareVersion != 1) {

		PDEBUG(D_ERR, "only firmware version 1 is supported (got: %d)",

		PERR("only firmware version 1 is supported (got: %d)",

		     sd->params.version.firmwareVersion);

		return -ENODEV;

	}
@@ -1475,9 +1473,9 @@ static int sd_start(struct gspca_dev *gspca_dev) 
	/* Start the camera in low power mode */

	if (goto_low_power(gspca_dev)) {

		if (sd->params.status.systemState != WARM_BOOT_STATE) {

			PDEBUG(D_ERR, "unexpected systemstate: %02x",

			PERR("unexpected systemstate: %02x",

			     sd->params.status.systemState);

			printstatus(&sd->params);

			printstatus(gspca_dev, &sd->params);

			return -ENODEV;

		}
@@ -1523,9 +1521,8 @@ static int sd_start(struct gspca_dev *gspca_dev) 
		return ret;



	if (sd->params.status.fatalError) {

		PDEBUG(D_ERR, "fatal_error: %04x, vp_status: %04x",

		       sd->params.status.fatalError,

		       sd->params.status.vpStatus);

		PERR("fatal_error: %04x, vp_status: %04x",

		     sd->params.status.fatalError, sd->params.status.vpStatus);

		return -EIO;

	}

drivers/media/usb/gspca/etoms.c

+4 −6
Original line number Diff line number Diff line
@@ -163,12 +163,11 @@ static void reg_r(struct gspca_dev *gspca_dev, 
{

	struct usb_device *dev = gspca_dev->dev;



#ifdef GSPCA_DEBUG

	if (len > USB_BUF_SZ) {

		pr_err("reg_r: buffer overflow\n");

		PERR("reg_r: buffer overflow\n");

		return;

	}

#endif



	usb_control_msg(dev,

			usb_rcvctrlpipe(dev, 0),

			0,
@@ -201,13 +200,12 @@ static void reg_w(struct gspca_dev *gspca_dev, 
{

	struct usb_device *dev = gspca_dev->dev;



#ifdef GSPCA_DEBUG

	if (len > USB_BUF_SZ) {

		pr_err("reg_w: buffer overflow\n");

		return;

	}

	PDEBUG(D_USBO, "reg write [%02x] = %02x..", index, *buffer);

#endif



	memcpy(gspca_dev->usb_buf, buffer, len);

	usb_control_msg(dev,

			usb_sndctrlpipe(dev, 0),
@@ -274,7 +272,7 @@ static int et_video(struct gspca_dev *gspca_dev, 
		     : 0);		/* stopvideo */

	ret = Et_WaitStatus(gspca_dev);

	if (ret != 0)

		PDEBUG(D_ERR, "timeout video on/off");

		PERR("timeout video on/off");

	return ret;

}

drivers/media/usb/gspca/gl860/gl860.c

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ int gl860_RTx(struct gspca_dev *gspca_dev, 
		pr_err("ctrl transfer failed %4d [p%02x r%d v%04x i%04x len%d]\n",

		       r, pref, req, val, index, len);

	else if (len > 1 && r < len)

		PDEBUG(D_ERR, "short ctrl transfer %d/%d", r, len);

		PERR("short ctrl transfer %d/%d", r, len);



	msleep(1);