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

Commit 230b27cd authored by Daniel Mack's avatar Daniel Mack Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: drivers/media/dvb/dvb-usb/dib0700: CodingStyle fixes 



Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8871c85d

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

+35 −31
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen 
int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val)

{

	u8 buf[3] = { REQUEST_SET_GPIO, gpio, ((gpio_dir & 0x01) << 7) | ((gpio_val & 0x01) << 6) };

	return dib0700_ctrl_wr(d,buf,3);

	return dib0700_ctrl_wr(d, buf, sizeof(buf));

}



static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets)
@@ -122,11 +122,12 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets) 


		deb_info("set the USB xfer len to %i Ts packet\n", nb_ts_packets);



	ret = dib0700_ctrl_wr(d, b, 3);

		ret = dib0700_ctrl_wr(d, b, sizeof(b));

	} else {

		deb_info("this firmware does not allow to change the USB xfer len\n");

		ret = -EIO;

	}



	return ret;

}
@@ -178,7 +179,8 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, 
			value = ((en_start << 7) | (en_stop << 6) |

				 (msg[i].len & 0x3F)) << 8 | i2c_dest;

			/* I2C ctrl + FE bus; */

			index = ((gen_mode<<6)&0xC0) | ((bus_mode<<4)&0x30);

			index = ((gen_mode << 6) & 0xC0) |

				((bus_mode << 4) & 0x30);



			result = usb_control_msg(d->udev,

						 usb_rcvctrlpipe(d->udev, 0),
@@ -198,11 +200,12 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, 
		} else {

			/* Write request */

			buf[0] = REQUEST_NEW_I2C_WRITE;

			buf[1] = (msg[i].addr << 1);

			buf[1] = msg[i].addr << 1;

			buf[2] = (en_start << 7) | (en_stop << 6) |

				(msg[i].len & 0x3F);

			/* I2C ctrl + FE bus; */

			buf[3] = ((gen_mode<<6)&0xC0) | ((bus_mode<<4)&0x30);

			buf[3] = ((gen_mode << 6) & 0xC0) |

				 ((bus_mode << 4) & 0x30);

			/* The Actual i2c payload */

			memcpy(&buf[4], msg[i].buf, msg[i].len);
@@ -240,7 +243,7 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap, 


	for (i = 0; i < num; i++) {

		/* fill in the address */

		buf[1] = (msg[i].addr << 1);

		buf[1] = msg[i].addr << 1;

		/* fill the buffer */

		memcpy(&buf[2], msg[i].buf, msg[i].len);
@@ -368,7 +371,8 @@ int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw 
	u8 buf[260];



	while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) {

		deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",hx.addr, hx.len, hx.chk);

		deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",

				hx.addr, hx.len, hx.chk);



		buf[0] = hx.len;

		buf[1] = (hx.addr >> 8) & 0xff;
@@ -415,9 +419,9 @@ int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw 
	for (i = 0; i < dib0700_device_count; i++) {

		for (adap_num = 0; adap_num < dib0700_devices[i].num_adapters;

				adap_num++) {

			if (fw_version >= 0x10201)

			if (fw_version >= 0x10201) {

				dib0700_devices[i].adapter[adap_num].stream.u.bulk.buffersize = 188*nb_packet_buffer_size;

			else {

			} else {

				/* for fw version older than 1.20.1,

				 * the buffersize has to be n times 512 */

				dib0700_devices[i].adapter[adap_num].stream.u.bulk.buffersize = ((188*nb_packet_buffer_size+188/2)/512)*512;
@@ -453,7 +457,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) 
	if (st->disable_streaming_master_mode == 1)

		b[2] = 0x00;

	else

		b[2] = (0x01 << 4); /* Master mode */

		b[2] = 0x01 << 4; /* Master mode */



	b[3] = 0x00;