evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

i2c: Simplify i2c_detect_address

Browse source 
The kind parameter of i2c_detect_address() always has value -1, so we
can get rid of it.

Next step is to update all i2c detect callback functions to get rid of
this now useless parameter.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
Jean Delvare 2009-12-06 17:06:25 +01:00
parent c7b25a9e96
commit ccfbbd082a
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/i2c/i2c-core.c
View file

@ -1180,7 +1180,7 @@ EXPORT_SYMBOL(i2c_master_recv);
* ---------------------------------------------------- * ----------------------------------------------------
*/ */
static int i2c_detect_address(struct i2c_client *temp_client, int kind, static int i2c_detect_address(struct i2c_client *temp_client,
struct i2c_driver *driver) struct i2c_driver *driver)
{ {
struct i2c_board_info info; struct i2c_board_info info;
@ -1199,22 +1199,18 @@ static int i2c_detect_address(struct i2c_client *temp_client, int kind,
if (i2c_check_addr(adapter, addr)) if (i2c_check_addr(adapter, addr))
return 0; return 0;
/* Make sure there is something at this address, unless forced */ /* Make sure there is something at this address */
if (kind < 0) { if (i2c_smbus_xfer(adapter, addr, 0, 0, 0, I2C_SMBUS_QUICK, NULL) < 0)
if (i2c_smbus_xfer(adapter, addr, 0, 0, 0, return 0;
I2C_SMBUS_QUICK, NULL) < 0)
return 0;
/* prevent 24RF08 corruption */ /* Prevent 24RF08 corruption */
if ((addr & ~0x0f) == 0x50) if ((addr & ~0x0f) == 0x50)
i2c_smbus_xfer(adapter, addr, 0, 0, 0, i2c_smbus_xfer(adapter, addr, 0, 0, 0, I2C_SMBUS_QUICK, NULL);
I2C_SMBUS_QUICK, NULL);
}
/* Finally call the custom detection function */ /* Finally call the custom detection function */
memset(&info, 0, sizeof(struct i2c_board_info)); memset(&info, 0, sizeof(struct i2c_board_info));
info.addr = addr; info.addr = addr;
err = driver->detect(temp_client, kind, &info); err = driver->detect(temp_client, -1, &info);
if (err) { if (err) {
/* -ENODEV is returned if the detection fails. We catch it /* -ENODEV is returned if the detection fails. We catch it
here as this isn't an error. */ here as this isn't an error. */
@ -1279,7 +1275,7 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
"addr 0x%02x\n", adap_id, "addr 0x%02x\n", adap_id,
address_data->normal_i2c[i]); address_data->normal_i2c[i]);
temp_client->addr = address_data->normal_i2c[i]; temp_client->addr = address_data->normal_i2c[i];
err = i2c_detect_address(temp_client, -1, driver); err = i2c_detect_address(temp_client, driver);
if (err) if (err)
goto exit_free; goto exit_free;
} }