aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-06-02 12:58:07 -0400
committerGuenter Roeck <linux@roeck-us.net>2012-07-22 00:48:40 -0400
commit647ff514d8a099fcce029283c1ecc38519b218d6 (patch)
treeb7b16374a8fb3c2844252602f2d4fbab81ba7fea /drivers
parentbba636d0592e5d33b960ba480459180ad5dc1fdd (diff)
hwmon: (gl520sm) 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/gl520sm.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index 5ff452b6a4d0..a21ff252f2f1 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -779,11 +779,10 @@ static int gl520_probe(struct i2c_client *client,
779 struct gl520_data *data; 779 struct gl520_data *data;
780 int err; 780 int err;
781 781
782 data = kzalloc(sizeof(struct gl520_data), GFP_KERNEL); 782 data = devm_kzalloc(&client->dev, sizeof(struct gl520_data),
783 if (!data) { 783 GFP_KERNEL);
784 err = -ENOMEM; 784 if (!data)
785 goto exit; 785 return -ENOMEM;
786 }
787 786
788 i2c_set_clientdata(client, data); 787 i2c_set_clientdata(client, data);
789 mutex_init(&data->update_lock); 788 mutex_init(&data->update_lock);
@@ -794,7 +793,7 @@ static int gl520_probe(struct i2c_client *client,
794 /* Register sysfs hooks */ 793 /* Register sysfs hooks */
795 err = sysfs_create_group(&client->dev.kobj, &gl520_group); 794 err = sysfs_create_group(&client->dev.kobj, &gl520_group);
796 if (err) 795 if (err)
797 goto exit_free; 796 return err;
798 797
799 if (data->two_temps) 798 if (data->two_temps)
800 err = sysfs_create_group(&client->dev.kobj, &gl520_group_temp2); 799 err = sysfs_create_group(&client->dev.kobj, &gl520_group_temp2);
@@ -816,9 +815,6 @@ exit_remove_files:
816 sysfs_remove_group(&client->dev.kobj, &gl520_group); 815 sysfs_remove_group(&client->dev.kobj, &gl520_group);
817 sysfs_remove_group(&client->dev.kobj, &gl520_group_in4); 816 sysfs_remove_group(&client->dev.kobj, &gl520_group_in4);
818 sysfs_remove_group(&client->dev.kobj, &gl520_group_temp2); 817 sysfs_remove_group(&client->dev.kobj, &gl520_group_temp2);
819exit_free:
820 kfree(data);
821exit:
822 return err; 818 return err;
823} 819}
824 820
@@ -870,7 +866,6 @@ static int gl520_remove(struct i2c_client *client)
870 sysfs_remove_group(&client->dev.kobj, &gl520_group_in4); 866 sysfs_remove_group(&client->dev.kobj, &gl520_group_in4);
871 sysfs_remove_group(&client->dev.kobj, &gl520_group_temp2); 867 sysfs_remove_group(&client->dev.kobj, &gl520_group_temp2);
872 868
873 kfree(data);
874 return 0; 869 return 0;
875} 870}
876 871