UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Jean Delvare 2007-09-08 23:19:32 -03:00 committed by Mauro Carvalho Chehab
parent 56585386e2
commit 7fb0dfc853
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
View File

@ -389,10 +389,6 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap,
ret = -EINVAL; ret = -EINVAL;
goto done; 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) { if (msgs[0].addr < PVR2_I2C_FUNC_CNT) {
funcp = hdw->i2c_func[msgs[0].addr]; 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; cnt = msgs[idx].len;
printk(KERN_INFO printk(KERN_INFO
"pvrusb2 i2c xfer %u/%u:" "pvrusb2 i2c xfer %u/%u:"
" addr=0x%x len=%d %s%s", " addr=0x%x len=%d %s",
idx+1,num, idx+1,num,
msgs[idx].addr, msgs[idx].addr,
cnt, cnt,
(msgs[idx].flags & I2C_M_RD ? (msgs[idx].flags & I2C_M_RD ?
"read" : "write"), "read" : "write"));
(msgs[idx].flags & I2C_M_NOSTART ?
" nostart" : ""));
if ((ret > 0) || !(msgs[idx].flags & I2C_M_RD)) { if ((ret > 0) || !(msgs[idx].flags & I2C_M_RD)) {
if (cnt > 8) cnt = 8; if (cnt > 8) cnt = 8;
printk(" ["); printk(" [");
@ -534,7 +528,7 @@ static int pvr2_i2c_control(struct i2c_adapter *adapter,
static u32 pvr2_i2c_functionality(struct i2c_adapter *adap) 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, static int pvr2_i2c_core_singleton(struct i2c_client *cp,