aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-06-02 12:57:59 -0400
committerGuenter Roeck <linux@roeck-us.net>2012-07-22 00:48:39 -0400
commit3421e212e6dfa6792877ef0b9e7a147ee15a59c0 (patch)
treec18912182f7000bf583b43d53a4df454ab7065c6
parent06ce97d608fb0599509c1c586662ba4778719fc4 (diff)
hwmon: (adm1026) Convert to use devm_ functions
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>
-rw-r--r--drivers/hwmon/adm1026.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index 1003219b9f90..0f068e7297ee 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -1834,11 +1834,10 @@ static int adm1026_probe(struct i2c_client *client,
1834 struct adm1026_data *data; 1834 struct adm1026_data *data;
1835 int err; 1835 int err;
1836 1836
1837 data = kzalloc(sizeof(struct adm1026_data), GFP_KERNEL); 1837 data = devm_kzalloc(&client->dev, sizeof(struct adm1026_data),
1838 if (!data) { 1838 GFP_KERNEL);
1839 err = -ENOMEM; 1839 if (!data)
1840 goto exit; 1840 return -ENOMEM;
1841 }
1842 1841
1843 i2c_set_clientdata(client, data); 1842 i2c_set_clientdata(client, data);
1844 mutex_init(&data->update_lock); 1843 mutex_init(&data->update_lock);
@@ -1852,7 +1851,7 @@ static int adm1026_probe(struct i2c_client *client,
1852 /* Register sysfs hooks */ 1851 /* Register sysfs hooks */
1853 err = sysfs_create_group(&client->dev.kobj, &adm1026_group); 1852 err = sysfs_create_group(&client->dev.kobj, &adm1026_group);
1854 if (err) 1853 if (err)
1855 goto exitfree; 1854 return err;
1856 if (data->config1 & CFG1_AIN8_9) 1855 if (data->config1 & CFG1_AIN8_9)
1857 err = sysfs_create_group(&client->dev.kobj, 1856 err = sysfs_create_group(&client->dev.kobj,
1858 &adm1026_group_in8_9); 1857 &adm1026_group_in8_9);
@@ -1877,9 +1876,6 @@ exitremove:
1877 sysfs_remove_group(&client->dev.kobj, &adm1026_group_in8_9); 1876 sysfs_remove_group(&client->dev.kobj, &adm1026_group_in8_9);
1878 else 1877 else
1879 sysfs_remove_group(&client->dev.kobj, &adm1026_group_temp3); 1878 sysfs_remove_group(&client->dev.kobj, &adm1026_group_temp3);
1880exitfree:
1881 kfree(data);
1882exit:
1883 return err; 1879 return err;
1884} 1880}
1885 1881
@@ -1892,7 +1888,6 @@ static int adm1026_remove(struct i2c_client *client)
1892 sysfs_remove_group(&client->dev.kobj, &adm1026_group_in8_9); 1888 sysfs_remove_group(&client->dev.kobj, &adm1026_group_in8_9);
1893 else 1889 else
1894 sysfs_remove_group(&client->dev.kobj, &adm1026_group_temp3); 1890 sysfs_remove_group(&client->dev.kobj, &adm1026_group_temp3);
1895 kfree(data);
1896 return 0; 1891 return 0;
1897} 1892}
1898 1893