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

Commit f35db23c authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4949): Cxusb: codingstyle cleanups 



Trivial whitespace / 80-column limit cleanups

Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 79a54cbd

drivers/media/dvb/dvb-usb/cxusb.c

+60 −50
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ static void cxusb_gpio_tuner(struct dvb_usb_device *d, int onoff) 
}



/* I2C */

static int cxusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)

static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],

			  int num)

{

	struct dvb_usb_device *d = i2c_get_adapdata(adap);

	int i;
@@ -122,7 +123,8 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num) 
			obuf[1] = msg[i].len;

			memcpy(&obuf[2], msg[i].buf, msg[i].len);



			if (cxusb_ctrl_msg(d,CMD_I2C_WRITE, obuf, 2+msg[i].len, &ibuf,1) < 0)

			if (cxusb_ctrl_msg(d, CMD_I2C_WRITE, obuf,

					   2+msg[i].len, &ibuf,1) < 0)

				break;

			if (ibuf != 0x08)

				deb_i2c("i2c write may have failed\n");
@@ -326,7 +328,6 @@ static int cxusb_mt352_demod_init(struct dvb_frontend* fe) 


static struct cx22702_config cxusb_cx22702_config = {

	.demod_address = 0x63,



	.output_mode = CX22702_PARALLEL_OUTPUT,

};
@@ -399,7 +400,8 @@ static int cxusb_cx22702_frontend_attach(struct dvb_usb_adapter *adap) 


	cxusb_ctrl_msg(adap->dev, CMD_DIGITAL, NULL, 0, &b, 1);



	if ((adap->fe = dvb_attach(cx22702_attach, &cxusb_cx22702_config, &adap->dev->i2c_adap)) != NULL)

	if ((adap->fe = dvb_attach(cx22702_attach, &cxusb_cx22702_config,

				   &adap->dev->i2c_adap)) != NULL)

		return 0;



	return -EIO;
@@ -412,7 +414,8 @@ static int cxusb_lgdt3303_frontend_attach(struct dvb_usb_adapter *adap) 


	cxusb_ctrl_msg(adap->dev, CMD_DIGITAL, NULL, 0, NULL, 0);



	if ((adap->fe = dvb_attach(lgdt330x_attach, &cxusb_lgdt3303_config, &adap->dev->i2c_adap)) != NULL)

	if ((adap->fe = dvb_attach(lgdt330x_attach, &cxusb_lgdt3303_config,

				   &adap->dev->i2c_adap)) != NULL)

		return 0;



	return -EIO;
@@ -426,7 +429,8 @@ static int cxusb_mt352_frontend_attach(struct dvb_usb_adapter *adap) 


	cxusb_ctrl_msg(adap->dev, CMD_DIGITAL, NULL, 0, NULL, 0);



	if ((adap->fe = dvb_attach(mt352_attach, &cxusb_mt352_config, &adap->dev->i2c_adap)) != NULL)

	if ((adap->fe = dvb_attach(mt352_attach, &cxusb_mt352_config,

				   &adap->dev->i2c_adap)) != NULL)

		return 0;



	return -EIO;
@@ -439,8 +443,11 @@ static int cxusb_dee1601_frontend_attach(struct dvb_usb_adapter *adap) 


	cxusb_ctrl_msg(adap->dev, CMD_DIGITAL, NULL, 0, NULL, 0);



	if (((adap->fe = dvb_attach(mt352_attach, &cxusb_dee1601_config, &adap->dev->i2c_adap)) != NULL) ||

		((adap->fe = dvb_attach(zl10353_attach, &cxusb_zl10353_dee1601_config, &adap->dev->i2c_adap)) != NULL))

	if (((adap->fe = dvb_attach(mt352_attach, &cxusb_dee1601_config,

				    &adap->dev->i2c_adap)) != NULL) ||

		((adap->fe = dvb_attach(zl10353_attach,

					&cxusb_zl10353_dee1601_config,

					&adap->dev->i2c_adap)) != NULL))

		return 0;



	return -EIO;
@@ -452,7 +459,8 @@ static int cxusb_dee1601_frontend_attach(struct dvb_usb_adapter *adap) 
 */



#define BLUEBIRD_01_ID_OFFSET 6638

static int bluebird_patch_dvico_firmware_download(struct usb_device *udev, const struct firmware *fw)

static int bluebird_patch_dvico_firmware_download(struct usb_device *udev,

						  const struct firmware *fw)

{

	if (fw->size < BLUEBIRD_01_ID_OFFSET + 4)

		return -EINVAL;
@@ -460,8 +468,10 @@ static int bluebird_patch_dvico_firmware_download(struct usb_device *udev, const 
	if (fw->data[BLUEBIRD_01_ID_OFFSET] == (USB_VID_DVICO & 0xff) &&

	    fw->data[BLUEBIRD_01_ID_OFFSET + 1] == USB_VID_DVICO >> 8) {



		fw->data[BLUEBIRD_01_ID_OFFSET + 2] = udev->descriptor.idProduct + 1;

		fw->data[BLUEBIRD_01_ID_OFFSET + 3] = udev->descriptor.idProduct >> 8;

		fw->data[BLUEBIRD_01_ID_OFFSET + 2] =

			udev->descriptor.idProduct + 1;

		fw->data[BLUEBIRD_01_ID_OFFSET + 3] =

			udev->descriptor.idProduct >> 8;



		return usb_cypress_load_firmware(udev, fw, CYPRESS_FX2);

	}