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

Commit 7fb0dfc8 authored by Jean Delvare's avatar Jean Delvare Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6212): pvrusb2: I2C adapter tweaks from Jean Delvare 



* I2C adapters aren't expected to handle I2C_M_NOSTART unless they
  really have to. As the pvrusb2 driver doesn't support it, I take it
  that it doesn't need it so it shouldn't mention it at all.
* I2C_FUNC_SMBUS_EMUL includes I2C_FUNC_SMBUS_BYTE_DATA so listing
  both is redundant.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 56585386

drivers/media/video/pvrusb2/pvrusb2-i2c-core.c

+3 −9
Original line number Diff line number Diff line
@@ -389,10 +389,6 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap, 
		ret = -EINVAL;

		goto done;

	}

	if ((msgs[0].flags & I2C_M_NOSTART)) {

		trace_i2c("i2c refusing I2C_M_NOSTART");

		goto done;

	}

	if (msgs[0].addr < PVR2_I2C_FUNC_CNT) {

		funcp = hdw->i2c_func[msgs[0].addr];

	}
@@ -494,14 +490,12 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap, 
			cnt = msgs[idx].len;

			printk(KERN_INFO

			       "pvrusb2 i2c xfer %u/%u:"

			       " addr=0x%x len=%d %s%s",

			       " addr=0x%x len=%d %s",

			       idx+1,num,

			       msgs[idx].addr,

			       cnt,

			       (msgs[idx].flags & I2C_M_RD ?

				"read" : "write"),

			       (msgs[idx].flags & I2C_M_NOSTART ?

				" nostart" : ""));

				"read" : "write"));

			if ((ret > 0) || !(msgs[idx].flags & I2C_M_RD)) {

				if (cnt > 8) cnt = 8;

				printk(" [");
@@ -534,7 +528,7 @@ static int pvr2_i2c_control(struct i2c_adapter *adapter, 


static u32 pvr2_i2c_functionality(struct i2c_adapter *adap)

{

	return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C | I2C_FUNC_SMBUS_BYTE_DATA;

	return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C;

}



static int pvr2_i2c_core_singleton(struct i2c_client *cp,