aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-06-02 12:58:05 -0400
committerGuenter Roeck <linux@roeck-us.net>2012-09-24 00:08:31 -0400
commit05639bcb4b0d509090026e836addaa3b28a14d14 (patch)
treee8b41c78106dc97a12bfbce7bce856484bca5170 /drivers/hwmon
parent33cd66e3c8048f03b9cc107b7a21c29cfd700ab7 (diff)
hwmon: (f75375s) Convert to use devm_ functions
Convert to use devm_ functions to reduce code size and simplify the code. Cc: Riku Voipio <riku.voipio@iki.fi> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/f75375s.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
index ece4159bd453..f7dba229395f 100644
--- a/drivers/hwmon/f75375s.c
+++ b/drivers/hwmon/f75375s.c
@@ -838,7 +838,8 @@ static int f75375_probe(struct i2c_client *client,
838 if (!i2c_check_functionality(client->adapter, 838 if (!i2c_check_functionality(client->adapter,
839 I2C_FUNC_SMBUS_BYTE_DATA)) 839 I2C_FUNC_SMBUS_BYTE_DATA))
840 return -EIO; 840 return -EIO;
841 data = kzalloc(sizeof(struct f75375_data), GFP_KERNEL); 841 data = devm_kzalloc(&client->dev, sizeof(struct f75375_data),
842 GFP_KERNEL);
842 if (!data) 843 if (!data)
843 return -ENOMEM; 844 return -ENOMEM;
844 845
@@ -848,7 +849,7 @@ static int f75375_probe(struct i2c_client *client,
848 849
849 err = sysfs_create_group(&client->dev.kobj, &f75375_group); 850 err = sysfs_create_group(&client->dev.kobj, &f75375_group);
850 if (err) 851 if (err)
851 goto exit_free; 852 return err;
852 853
853 if (data->kind != f75373) { 854 if (data->kind != f75373) {
854 err = sysfs_chmod_file(&client->dev.kobj, 855 err = sysfs_chmod_file(&client->dev.kobj,
@@ -875,8 +876,6 @@ static int f75375_probe(struct i2c_client *client,
875 876
876exit_remove: 877exit_remove:
877 sysfs_remove_group(&client->dev.kobj, &f75375_group); 878 sysfs_remove_group(&client->dev.kobj, &f75375_group);
878exit_free:
879 kfree(data);
880 return err; 879 return err;
881} 880}
882 881
@@ -885,7 +884,6 @@ static int f75375_remove(struct i2c_client *client)
885 struct f75375_data *data = i2c_get_clientdata(client); 884 struct f75375_data *data = i2c_get_clientdata(client);
886 hwmon_device_unregister(data->hwmon_dev); 885 hwmon_device_unregister(data->hwmon_dev);
887 sysfs_remove_group(&client->dev.kobj, &f75375_group); 886 sysfs_remove_group(&client->dev.kobj, &f75375_group);
888 kfree(data);
889 return 0; 887 return 0;
890} 888}
891 889