Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon updates from Guenter Roeck:
 "New drivers for DA9052/53 PMIC as well as HIH-6130/HIH-6131 humidity
  and temperature sensors.

  Convert drivers to use devm_ functions and to use dev_pm_ops.  Address
  a couple of Coverity errors/warnings as well as compile warnings.
  Some functional improvements in applesmc driver."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (72 commits)
  hwmon: (applesmc) Ignore some temperature registers
  hwmon: (applesmc) Allow negative temperature values
  hwmon: (s3c-hwmon) Use devm_kzalloc instead of kzalloc
  hwmon: (w83781d) Fix compile warning
  hwmon: (applesmc) Shorten minimum wait time
  hwmon: (exynos4_tmu) Use struct dev_pm_ops for power management
  hwmon: (gpio-fan) Use struct dev_pm_ops for power management
  hwmon: (abituguru3) Use struct dev_pm_ops for power management
  hwmon: (abituguru) Use struct dev_pm_ops for power management
  hwmon: (acpi_power_meter) Fix unintentional integer overflow
  hwmon: (acpi_power_meter) Cleanup and optimizations
  hwmon: Honeywell Humidicon HIH-6130/HIH-6131 humidity and temperature sensor driver
  hwmon: (applesmc) Skip sensor mapping
  hwmon: (ntc_thermistor) Ensure that data->name string is terminated
  hwmon: (w83l785ts) Convert to use devm_ functions
  hwmon: (w83l785ts) Simplify code and improve readability
  hwmon: (smsc47m192) Convert to use devm_ functions
  hwmon: (smsc47m1) Convert to use devm_ functions
  hwmon: (smsc47b397) Convert to use devm_ functions
  hwmon: (k8temp) Convert to use devm_ functions
  ...

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c
index 33a8a7f15e18..f739f83bafb9 100644
--- a/drivers/hwmon/max6650.c
+++ b/drivers/hwmon/max6650.c
@@ -545,7 +545,8 @@ static int max6650_probe(struct i2c_client *client,
         struct max6650_data *data;
         int err;
 
-        data = kzalloc(sizeof(struct max6650_data), GFP_KERNEL);
+        data = devm_kzalloc(&client->dev, sizeof(struct max6650_data),
+                            GFP_KERNEL);
         if (!data) {
                 dev_err(&client->dev, "out of memory.\n");
                 return -ENOMEM;
@@ -560,11 +561,11 @@ static int max6650_probe(struct i2c_client *client,
          */
         err = max6650_init_client(client);
         if (err)
-                goto err_free;
+                return err;
 
         err = sysfs_create_group(&client->dev.kobj, &max6650_attr_grp);
         if (err)
-                goto err_free;
+                return err;
         /* 3 additional fan inputs for the MAX6651 */
         if (data->nr_fans == 4) {
                 err = sysfs_create_group(&client->dev.kobj, &max6651_attr_grp);
@@ -582,8 +583,6 @@ static int max6650_probe(struct i2c_client *client,
                 sysfs_remove_group(&client->dev.kobj, &max6651_attr_grp);
 err_remove:
         sysfs_remove_group(&client->dev.kobj, &max6650_attr_grp);
-err_free:
-        kfree(data);
         return err;
 }
 
@@ -595,7 +594,6 @@ static int max6650_remove(struct i2c_client *client)
         if (data->nr_fans == 4)
                 sysfs_remove_group(&client->dev.kobj, &max6651_attr_grp);
         sysfs_remove_group(&client->dev.kobj, &max6650_attr_grp);
-        kfree(data);
         return 0;
 }