Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f9286434ea64803b673bb4ec0dd7084b13c2d90b

Authored by Guenter Roeck
1 parent 9cc7dcc523
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

hwmon: (amc6821) 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>

Showing 1 changed file with 5 additions and 11 deletions Side-by-side Diff

drivers/hwmon/amc6821.c
Diff comments   View file @ f928643
... ... @@ -862,13 +862,11 @@
862 862 struct amc6821_data *data;
863 863 int err;
864 864  
865   - data = kzalloc(sizeof(struct amc6821_data), GFP_KERNEL);
866   - if (!data) {
867   - dev_err(&client->dev, "out of memory.\n");
  865 + data = devm_kzalloc(&client->dev, sizeof(struct amc6821_data),
  866 + GFP_KERNEL);
  867 + if (!data)
868 868 return -ENOMEM;
869   - }
870 869  
871   -
872 870 i2c_set_clientdata(client, data);
873 871 mutex_init(&data->update_lock);
874 872  
875 873  
... ... @@ -877,11 +875,11 @@
877 875 */
878 876 err = amc6821_init_client(client);
879 877 if (err)
880   - goto err_free;
  878 + return err;
881 879  
882 880 err = sysfs_create_group(&client->dev.kobj, &amc6821_attr_grp);
883 881 if (err)
884   - goto err_free;
  882 + return err;
885 883  
886 884 data->hwmon_dev = hwmon_device_register(&client->dev);
887 885 if (!IS_ERR(data->hwmon_dev))
... ... @@ -890,8 +888,6 @@
890 888 err = PTR_ERR(data->hwmon_dev);
891 889 dev_err(&client->dev, "error registering hwmon device.\n");
892 890 sysfs_remove_group(&client->dev.kobj, &amc6821_attr_grp);
893   -err_free:
894   - kfree(data);
895 891 return err;
896 892 }
897 893  
... ... @@ -901,8 +897,6 @@
901 897  
902 898 hwmon_device_unregister(data->hwmon_dev);
903 899 sysfs_remove_group(&client->dev.kobj, &amc6821_attr_grp);
904   -
905   - kfree(data);
906 900  
907 901 return 0;
908 902 }