a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwmon: (tmp102) Convert to use devm_ functions

Browse Source 
Convert to use devm_ functions to reduce code size and simplify the code.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
Guenter Roeck 2012-06-02 11:35:52 -07:00
parent bd91d3bab8
commit f511a21f4e
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/hwmon/tmp102.c
View File

@ -159,17 +159,16 @@ static int __devinit tmp102_probe(struct i2c_client *client,
return -ENODEV; return -ENODEV;
} }
tmp102 = kzalloc(sizeof(*tmp102), GFP_KERNEL); tmp102 = devm_kzalloc(&client->dev, sizeof(*tmp102), GFP_KERNEL);
if (!tmp102) { if (!tmp102)
dev_dbg(&client->dev, "kzalloc failed\n");
return -ENOMEM; return -ENOMEM;
}
i2c_set_clientdata(client, tmp102); i2c_set_clientdata(client, tmp102);
status = i2c_smbus_read_word_swapped(client, TMP102_CONF_REG); status = i2c_smbus_read_word_swapped(client, TMP102_CONF_REG);
if (status < 0) { if (status < 0) {
dev_err(&client->dev, "error reading config register\n"); dev_err(&client->dev, "error reading config register\n");
goto fail_free; return status;
} }
tmp102->config_orig = status; tmp102->config_orig = status;
status = i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, status = i2c_smbus_write_word_swapped(client, TMP102_CONF_REG,
@ -213,9 +212,6 @@ fail_remove_sysfs:
fail_restore_config: fail_restore_config:
i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, i2c_smbus_write_word_swapped(client, TMP102_CONF_REG,
tmp102->config_orig); tmp102->config_orig);
fail_free:
kfree(tmp102);
return status; return status;
} }
@ -236,8 +232,6 @@ static int __devexit tmp102_remove(struct i2c_client *client)
config | TMP102_CONF_SD); config | TMP102_CONF_SD);
} }
kfree(tmp102);
return 0; return 0;
} }