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

Commit fa74aca3 authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx-i2c: fix coding style of multi line comments 



Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d230d5ad

drivers/media/usb/em28xx/em28xx-i2c.c

+34 −18
Original line number Diff line number Diff line
@@ -171,8 +171,10 @@ static int em28xx_i2c_send_bytes(struct em28xx *dev, u16 addr, u8 *buf, 


	if (len < 1 || len > 64)

		return -EOPNOTSUPP;

	/* NOTE: limited by the USB ctrl message constraints

	 * Zero length reads always succeed, even if no device is connected */

	/*

	 * NOTE: limited by the USB ctrl message constraints

	 * Zero length reads always succeed, even if no device is connected

	 */



	/* Write to i2c device */

	ret = dev->em28xx_write_regs_req(dev, stop ? 2 : 3, addr, buf, len);
@@ -202,9 +204,11 @@ static int em28xx_i2c_send_bytes(struct em28xx *dev, u16 addr, u8 *buf, 
			return ret;

		}

		msleep(5);

		/* NOTE: do we really have to wait for success ?

		   Never seen anything else than 0x00 or 0x10

		   (even with high payload) ...			*/

		/*

		 * NOTE: do we really have to wait for success ?

		 * Never seen anything else than 0x00 or 0x10

		 * (even with high payload) ...

		 */

	}

	em28xx_warn("write to i2c device at 0x%x timed out\n", addr);

	return -EIO;
@@ -220,8 +224,10 @@ static int em28xx_i2c_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, u16 len) 


	if (len < 1 || len > 64)

		return -EOPNOTSUPP;

	/* NOTE: limited by the USB ctrl message constraints

	 * Zero length reads always succeed, even if no device is connected */

	/*

	 * NOTE: limited by the USB ctrl message constraints

	 * Zero length reads always succeed, even if no device is connected

	 */



	/* Read data from i2c device */

	ret = dev->em28xx_read_reg_req_len(dev, 2, addr, buf, len);
@@ -230,7 +236,8 @@ static int em28xx_i2c_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, u16 len) 
			    addr, ret);

		return ret;

	}

	/* NOTE: some devices with two i2c busses have the bad habit to return 0

	/*

	 * NOTE: some devices with two i2c busses have the bad habit to return 0

	 * bytes if we are on bus B AND there was no write attempt to the

	 * specified slave address before AND no device is present at the

	 * requested slave address.
@@ -366,7 +373,8 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap, 
	return num;

}



/* based on linux/sunrpc/svcauth.h and linux/hash.h

/*

 * based on linux/sunrpc/svcauth.h and linux/hash.h

 * The original hash function returns a different value, if arch is x86_64

 * or i386.

 */
@@ -391,8 +399,10 @@ static inline unsigned long em28xx_hash_mem(char *buf, int length, int bits) 
	return (hash >> (32 - bits)) & 0xffffffffUL;

}



/* Helper function to read data blocks from i2c clients with 8 or 16 bit

 * address width, 8 bit register width and auto incrementation been activated */

/*

 * Helper function to read data blocks from i2c clients with 8 or 16 bit

 * address width, 8 bit register width and auto incrementation been activated

 */

static int em28xx_i2c_read_block(struct em28xx *dev, unsigned bus, u16 addr,

				 bool addr_w16, u16 len, u8 *data)

{
@@ -434,9 +444,11 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned bus, 
			     u8 **eedata, u16 *eedata_len)

{

	const u16 len = 256;

	/* FIXME common length/size for bytes to read, to display, hash

	/*

	 * FIXME common length/size for bytes to read, to display, hash

	 * calculation and returned device dataset. Simplifies the code a lot,

	 * but we might have to deal with multiple sizes in the future !      */

	 * but we might have to deal with multiple sizes in the future !

	 */

	int i, err;

	struct em28xx_eeprom *dev_config;

	u8 buf, *data;
@@ -497,7 +509,8 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned bus, 
		em28xx_info("EEPROM info:\n");

		em28xx_info("\tmicrocode start address = 0x%04x, boot configuration = 0x%02x\n",

			    mc_start, data[2]);

		/* boot configuration (address 0x0002):

		/*

		 * boot configuration (address 0x0002):

		 * [0]   microcode download speed: 1 = 400 kHz; 0 = 100 kHz

		 * [1]   always selects 12 kb RAM

		 * [2]   USB device speed: 1 = force Full Speed; 0 = auto detect
@@ -506,8 +519,10 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned bus, 
		 *       characterization

		 */



		/* Read hardware config dataset offset from address

		 * (microcode start + 46)			    */

		/*

		 * Read hardware config dataset offset from address

		 * (microcode start + 46)

		 */

		err = em28xx_i2c_read_block(dev, bus, mc_start + 46, 1, 2,

					    data);

		if (err != 2) {
@@ -520,7 +535,8 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned bus, 
		hwconf_offset = mc_start + data[0] + (data[1] << 8);



		/* Read hardware config dataset */

		/* NOTE: the microcode copy can be multiple pages long, but

		/*

		 * NOTE: the microcode copy can be multiple pages long, but

		 * we assume the hardware config dataset is the same as in

		 * the old eeprom and not longer than 256 bytes.

		 * tveeprom is currently also limited to 256 bytes.