AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

hwmon: (w83791d) convert to use devm_i2c_new_dummy_device

Browse Source 
And simplify the error handling.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20190903181256.13450-2-wsa+renesas@sang-engineering.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Wolfram Sang 2019-09-03 20:12:54 +02:00 committed by Guenter Roeck
parent 09fe787051
commit 358d207110
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/hwmon/w83791d.c
View File

@ -1260,7 +1260,7 @@ static int w83791d_detect_subclients(struct i2c_client *client)
struct i2c_adapter *adapter = client->adapter; struct i2c_adapter *adapter = client->adapter;
struct w83791d_data *data = i2c_get_clientdata(client); struct w83791d_data *data = i2c_get_clientdata(client);
int address = client->addr; int address = client->addr;
int i, id, err; int i, id;
u8 val; u8 val;
id = i2c_adapter_id(adapter); id = i2c_adapter_id(adapter);
@ -1272,8 +1272,7 @@ static int w83791d_detect_subclients(struct i2c_client *client)
"invalid subclient " "invalid subclient "
"address %d; must be 0x48-0x4f\n", "address %d; must be 0x48-0x4f\n",
force_subclients[i]); force_subclients[i]);
err = -ENODEV; return -ENODEV;
goto error_sc_0;
} }
} }
w83791d_write(client, W83791D_REG_I2C_SUBADDR, w83791d_write(client, W83791D_REG_I2C_SUBADDR,
@ -1283,29 +1282,22 @@ static int w83791d_detect_subclients(struct i2c_client *client)
val = w83791d_read(client, W83791D_REG_I2C_SUBADDR); val = w83791d_read(client, W83791D_REG_I2C_SUBADDR);
if (!(val & 0x08)) if (!(val & 0x08))
data->lm75[0] = i2c_new_dummy(adapter, 0x48 + (val & 0x7)); data->lm75[0] = devm_i2c_new_dummy_device(&client->dev, adapter,
0x48 + (val & 0x7));
if (!(val & 0x80)) { if (!(val & 0x80)) {
if ((data->lm75[0] != NULL) && if (!IS_ERR(data->lm75[0]) &&
((val & 0x7) == ((val >> 4) & 0x7))) { ((val & 0x7) == ((val >> 4) & 0x7))) {
dev_err(&client->dev, dev_err(&client->dev,
"duplicate addresses 0x%x, " "duplicate addresses 0x%x, "
"use force_subclient\n", "use force_subclient\n",
data->lm75[0]->addr); data->lm75[0]->addr);
err = -ENODEV; return -ENODEV;
goto error_sc_1;
} }
data->lm75[1] = i2c_new_dummy(adapter, data->lm75[1] = devm_i2c_new_dummy_device(&client->dev, adapter,
0x48 + ((val >> 4) & 0x7)); 0x48 + ((val >> 4) & 0x7));
} }
return 0; return 0;
/* Undo inits in case of errors */
error_sc_1:
i2c_unregister_device(data->lm75[0]);
error_sc_0:
return err;
} }
@ -1394,7 +1386,7 @@ static int w83791d_probe(struct i2c_client *client,
/* Register sysfs hooks */ /* Register sysfs hooks */
err = sysfs_create_group(&client->dev.kobj, &w83791d_group); err = sysfs_create_group(&client->dev.kobj, &w83791d_group);
if (err) if (err)
goto error3; return err;
/* Check if pins of fan/pwm 4-5 are in use as GPIO */ /* Check if pins of fan/pwm 4-5 are in use as GPIO */
has_fanpwm45 = w83791d_read(client, W83791D_REG_GPIO) & 0x10; has_fanpwm45 = w83791d_read(client, W83791D_REG_GPIO) & 0x10;
@ -1419,9 +1411,6 @@ static int w83791d_probe(struct i2c_client *client,
sysfs_remove_group(&client->dev.kobj, &w83791d_group_fanpwm45); sysfs_remove_group(&client->dev.kobj, &w83791d_group_fanpwm45);
error4: error4:
sysfs_remove_group(&client->dev.kobj, &w83791d_group); sysfs_remove_group(&client->dev.kobj, &w83791d_group);
error3:
i2c_unregister_device(data->lm75[0]);
i2c_unregister_device(data->lm75[1]);
return err; return err;
} }
@ -1432,9 +1421,6 @@ static int w83791d_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &w83791d_group); sysfs_remove_group(&client->dev.kobj, &w83791d_group);
i2c_unregister_device(data->lm75[0]);
i2c_unregister_device(data->lm75[1]);
return 0; return 0;
} }