Commit 52173c5f authored by Joe Perches's avatar Joe Perches Committed by Mauro Carvalho Chehab
Browse files

media: gspca: Convert PERR to gspca_err 



Use a more typical kernel logging style.

The current macro hides the gspca_dev argument so add it to the
macro uses instead.

Miscellanea:

o Add missing '\n' terminations to formats
o Realign arguments to open parenthesis

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 6e298d58

drivers/media/usb/gspca/benq.c

+3 −3
Original line number Diff line number Diff line
@@ -180,7 +180,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) {

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

			gspca_err(gspca_dev, "ISOC bad lengths %d / %d\n",

				  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

+3 −3
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static void reg_r(struct gspca_dev *gspca_dev, 
	struct usb_device *dev = gspca_dev->dev;



	if (len > USB_BUF_SZ) {

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

		gspca_err(gspca_dev, "reg_r: buffer overflow\n");

		return;

	}
@@ -109,7 +109,7 @@ static void reg_w(struct gspca_dev *gspca_dev, 
	struct usb_device *dev = gspca_dev->dev;



	if (len > USB_BUF_SZ) {

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

		gspca_err(gspca_dev, "reg_w: buffer overflow\n");

		return;

	}

	PDEBUG(D_USBO, "reg write [%02x] = %02x..", index, *buffer);
@@ -683,7 +683,7 @@ static void cx11646_jpeg(struct gspca_dev*gspca_dev) 
		reg_w_val(gspca_dev, 0x0053, 0x00);

	} while (--retry);

	if (retry == 0)

		PERR("Damned Errors sending jpeg Table");

		gspca_err(gspca_dev, "Damned Errors sending jpeg Table\n");

	/* send the qtable now */

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

	length = 8;

drivers/media/usb/gspca/cpia1.c

+13 −11
Original line number Diff line number Diff line
@@ -419,7 +419,8 @@ 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 {

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

		gspca_err(gspca_dev, "Unexpected first byte of command: %x\n",

			  command[0]);

		return -EINVAL;

	}
@@ -722,7 +723,7 @@ 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) {

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

			gspca_err(gspca_dev, "unexpected state after lo power cmd: %02x\n",

				  sd->params.status.systemState);

			printstatus(gspca_dev, &sd->params);

		}
@@ -752,7 +753,7 @@ static int goto_high_power(struct gspca_dev *gspca_dev) 
		return ret;



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

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

		gspca_err(gspca_dev, "unexpected state after hi power cmd: %02x\n",

			  sd->params.status.systemState);

		printstatus(gspca_dev, &sd->params);

		return -EIO;
@@ -1445,7 +1446,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) {

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

		gspca_err(gspca_dev, "only firmware version 1 is supported (got: %d)\n",

			  sd->params.version.firmwareVersion);

		return -ENODEV;

	}
@@ -1471,7 +1472,7 @@ 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) {

			PERR("unexpected systemstate: %02x",

			gspca_err(gspca_dev, "unexpected systemstate: %02x\n",

				  sd->params.status.systemState);

			printstatus(gspca_dev, &sd->params);

			return -ENODEV;
@@ -1519,8 +1520,9 @@ static int sd_start(struct gspca_dev *gspca_dev) 
		return ret;



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

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

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

		gspca_err(gspca_dev, "fatal_error: %04x, vp_status: %04x\n",

			  sd->params.status.fatalError,

			  sd->params.status.vpStatus);

		return -EIO;

	}

drivers/media/usb/gspca/dtcs033.c

+6 −6
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int reg_reqs(struct gspca_dev *gspca_dev, 


		if (gspca_dev->usb_err < 0) {



			PERR("usb error request no: %d / %d\n",

			gspca_err(gspca_dev, "usb error request no: %d / %d\n",

				  i, n_reqs);

		} else if (preq->bRequestType & USB_DIR_IN) {
@@ -176,12 +176,12 @@ static void dtcs033_setexposure(struct gspca_dev *gspca_dev, 
	reg_rw(gspca_dev,

		bRequestType, bRequest, wValue, wIndex, 0);

	if (gspca_dev->usb_err < 0)

		PERR("usb error in setexposure(gain) sequence.\n");

		gspca_err(gspca_dev, "usb error in setexposure(gain) sequence\n");



	reg_rw(gspca_dev,

		bRequestType, bRequest, (xtimeVal<<4), 0x6300, 0);

	if (gspca_dev->usb_err < 0)

		PERR("usb error in setexposure(time) sequence.\n");

		gspca_err(gspca_dev, "usb error in setexposure(time) sequence\n");

}



/* specific webcam descriptor */
@@ -239,7 +239,7 @@ static int dtcs033_init_controls(struct gspca_dev *gspca_dev) 
				V4L2_CID_GAIN,

				14,  33,  1,  24);/* [dB] */

	if (hdl->error) {

		PERR("Could not initialize controls: %d\n",

		gspca_err(gspca_dev, "Could not initialize controls: %d\n",

			  hdl->error);

		return hdl->error;

	}

drivers/media/usb/gspca/etoms.c

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static void reg_r(struct gspca_dev *gspca_dev, 
	struct usb_device *dev = gspca_dev->dev;



	if (len > USB_BUF_SZ) {

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

		gspca_err(gspca_dev, "reg_r: buffer overflow\n");

		return;

	}
@@ -268,7 +268,7 @@ static int et_video(struct gspca_dev *gspca_dev, 
		     : 0);		/* stopvideo */

	ret = Et_WaitStatus(gspca_dev);

	if (ret != 0)

		PERR("timeout video on/off");

		gspca_err(gspca_dev, "timeout video on/off\n");

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE