Skip to content

Commit

Permalink
hwmon: (w83l785ts) Simplify code and improve readability
Browse files Browse the repository at this point in the history
In probe function, rename new_client variable to client, and introduce
local variable dev to point to client->dev, to simplify the code and
improve readability.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
  • Loading branch information
Guenter Roeck committed Jul 22, 2012
1 parent 2625996 commit f187fc0
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions drivers/hwmon/w83l785ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,11 @@ static int w83l785ts_detect(struct i2c_client *client,
return 0;
}

static int w83l785ts_probe(struct i2c_client *new_client,
static int w83l785ts_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct w83l785ts_data *data;
struct device *dev = &client->dev;
int err = 0;

data = kzalloc(sizeof(struct w83l785ts_data), GFP_KERNEL);
Expand All @@ -188,7 +189,7 @@ static int w83l785ts_probe(struct i2c_client *new_client,
goto exit;
}

i2c_set_clientdata(new_client, data);
i2c_set_clientdata(client, data);
data->valid = 0;
mutex_init(&data->update_lock);

Expand All @@ -200,18 +201,16 @@ static int w83l785ts_probe(struct i2c_client *new_client,
* Nothing yet, assume it is already started.
*/

err = device_create_file(&new_client->dev,
&sensor_dev_attr_temp1_input.dev_attr);
err = device_create_file(dev, &sensor_dev_attr_temp1_input.dev_attr);
if (err)
goto exit_remove;

err = device_create_file(&new_client->dev,
&sensor_dev_attr_temp1_max.dev_attr);
err = device_create_file(dev, &sensor_dev_attr_temp1_max.dev_attr);
if (err)
goto exit_remove;

/* Register sysfs hooks */
data->hwmon_dev = hwmon_device_register(&new_client->dev);
data->hwmon_dev = hwmon_device_register(dev);
if (IS_ERR(data->hwmon_dev)) {
err = PTR_ERR(data->hwmon_dev);
goto exit_remove;
Expand All @@ -220,10 +219,8 @@ static int w83l785ts_probe(struct i2c_client *new_client,
return 0;

exit_remove:
device_remove_file(&new_client->dev,
&sensor_dev_attr_temp1_input.dev_attr);
device_remove_file(&new_client->dev,
&sensor_dev_attr_temp1_max.dev_attr);
device_remove_file(dev, &sensor_dev_attr_temp1_input.dev_attr);
device_remove_file(dev, &sensor_dev_attr_temp1_max.dev_attr);
kfree(data);
exit:
return err;
Expand Down

0 comments on commit f187fc0

Please sign in to comment.