mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
V4L/DVB: Use custom I2C probing function mechanism
Now that i2c-core offers the possibility to provide custom probing function for I2C devices, let's make use of it. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]>
This commit is contained in:
parent
9a94241afc
commit
d44f19d586
4 changed files with 18 additions and 26 deletions
|
|
@ -364,17 +364,10 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
|
|||
|
||||
memset(&info, 0, sizeof(struct i2c_board_info));
|
||||
strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
|
||||
/*
|
||||
* We can't call i2c_new_probed_device() because it uses
|
||||
* quick writes for probing and the IR receiver device only
|
||||
* replies to reads.
|
||||
*/
|
||||
if (i2c_smbus_xfer(&bus->i2c_adap, addr_list[0], 0,
|
||||
I2C_SMBUS_READ, 0, I2C_SMBUS_QUICK,
|
||||
NULL) >= 0) {
|
||||
info.addr = addr_list[0];
|
||||
i2c_new_device(&bus->i2c_adap, &info);
|
||||
}
|
||||
/* Use quick read command for probe, some IR chips don't
|
||||
* support writes */
|
||||
i2c_new_probed_device(&bus->i2c_adap, &info, addr_list,
|
||||
i2c_probe_func_quick_read);
|
||||
}
|
||||
|
||||
return bus->i2c_rc;
|
||||
|
|
|
|||
|
|
@ -193,24 +193,13 @@ void cx88_i2c_init_ir(struct cx88_core *core)
|
|||
0x18, 0x6b, 0x71,
|
||||
I2C_CLIENT_END
|
||||
};
|
||||
const unsigned short *addrp;
|
||||
|
||||
memset(&info, 0, sizeof(struct i2c_board_info));
|
||||
strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
|
||||
/*
|
||||
* We can't call i2c_new_probed_device() because it uses
|
||||
* quick writes for probing and at least some R receiver
|
||||
* devices only reply to reads.
|
||||
*/
|
||||
for (addrp = addr_list; *addrp != I2C_CLIENT_END; addrp++) {
|
||||
if (i2c_smbus_xfer(&core->i2c_adap, *addrp, 0,
|
||||
I2C_SMBUS_READ, 0,
|
||||
I2C_SMBUS_QUICK, NULL) >= 0) {
|
||||
info.addr = *addrp;
|
||||
i2c_new_device(&core->i2c_adap, &info);
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* Use quick read command for probe, some IR chips don't
|
||||
* support writes */
|
||||
i2c_new_probed_device(&core->i2c_adap, &info, addr_list,
|
||||
i2c_probe_func_quick_read);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue