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

Pull hwmon changes for v3.4 from Guenter Roeck:
 "Mostly cleanup.  No new drivers this time around, but support for
  several chips added to existing drivers: TPS40400, TPS40422, MTD040,
  MAX34446, ZL9101M, ZL9117M, and LM96080.  Also, added watchdog support
  for SCH56xx, and additional attributes for a couple of drivers."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (137 commits)
  hwmon: (sch56xx) Add support for the integrated watchdog (v2)
  hwmon: (w83627ehf) Add support for temperature offset registers
  hwmon: (jc42) Remove unnecessary device IDs
  hwmon: (zl6100) Add support for ZL9101M and ZL9117M
  hwmon: (adm1275) Add support for ADM1075
  hwmon: (max34440) Add support for MAX34446
  hwmon: (pmbus) Add more virtual registers
  hwmon: (pmbus) Add support for Lineage Power MDT040
  hwmon: (pmbus) Add support for TI TPS40400 and TPS40422
  hwmon: (max34440) Add support for 'lowest' output voltage attribute
  hwmon: (jc42) Convert to use devm_kzalloc
  hwmon: (max16065) Convert to use devm_kzalloc
  hwmon: (smm665) Convert to use devm_kzalloc
  hwmon: (ltc4261) Convert to use devm_kzalloc
  hwmon: (pmbus) Simplify remove functions
  hwmon: (pmbus) Convert pmbus drivers to use devm_kzalloc
  hwmon: (lineage-pem) Convert to use devm_kzalloc
  hwmon: (hwmon-vid) Fix checkpatch issues
  hwmon: (hwmon-vid) Add new entries to VRM model table
  hwmon: (lm80) Add detection of NatSemi/TI LM96080
  ...

1 files changed, 9 insertions, 38 deletions

diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c
index 4ff6cf289f85..fbb1479d3ad4 100644
--- a/drivers/hwmon/pmbus/ucd9000.c
+++ b/drivers/hwmon/pmbus/ucd9000.c
@@ -155,7 +155,8 @@ static int ucd9000_probe(struct i2c_client *client,
                            "Device mismatch: Configured %s, detected %s\n",
                            id->name, mid->name);
 
-        data = kzalloc(sizeof(struct ucd9000_data), GFP_KERNEL);
+        data = devm_kzalloc(&client->dev, sizeof(struct ucd9000_data),
+                            GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
         info = &data->info;
@@ -164,13 +165,12 @@ static int ucd9000_probe(struct i2c_client *client,
         if (ret < 0) {
                 dev_err(&client->dev,
                         "Failed to read number of active pages\n");
-                goto out;
+                return ret;
         }
         info->pages = ret;
         if (!info->pages) {
                 dev_err(&client->dev, "No pages configured\n");
-                ret = -ENODEV;
-                goto out;
+                return -ENODEV;
         }
 
         /* The internal temperature sensor is always active */
@@ -181,8 +181,7 @@ static int ucd9000_probe(struct i2c_client *client,
                                         block_buffer);
         if (ret <= 0) {
                 dev_err(&client->dev, "Failed to read configuration data\n");
-                ret = -ENODEV;
-                goto out;
+                return -ENODEV;
         }
         for (i = 0; i < ret; i++) {
                 int page = UCD9000_MON_PAGE(block_buffer[i]);
@@ -218,7 +217,7 @@ static int ucd9000_probe(struct i2c_client *client,
                                                         UCD9000_FAN_CONFIG,
                                                         data->fan_data[i]);
                         if (ret < 0)
-                                goto out;
+                                return ret;
                 }
                 i2c_smbus_write_byte_data(client, UCD9000_FAN_CONFIG_INDEX, 0);
 
@@ -227,49 +226,21 @@ static int ucd9000_probe(struct i2c_client *client,
                   | PMBUS_HAVE_FAN34 | PMBUS_HAVE_STATUS_FAN34;
         }
 
-        ret = pmbus_do_probe(client, mid, info);
-        if (ret < 0)
-                goto out;
-        return 0;
-
-out:
-        kfree(data);
-        return ret;
-}
-
-static int ucd9000_remove(struct i2c_client *client)
-{
-        struct ucd9000_data *data;
-
-        data = to_ucd9000_data(pmbus_get_driver_info(client));
-        pmbus_do_remove(client);
-        kfree(data);
-        return 0;
+        return pmbus_do_probe(client, mid, info);
 }
 
-
 /* This is the driver that will be inserted */
 static struct i2c_driver ucd9000_driver = {
         .driver = {
                 .name = "ucd9000",
         },
         .probe = ucd9000_probe,
-        .remove = ucd9000_remove,
+        .remove = pmbus_do_remove,
         .id_table = ucd9000_id,
 };
 
-static int __init ucd9000_init(void)
-{
-        return i2c_add_driver(&ucd9000_driver);
-}
-
-static void __exit ucd9000_exit(void)
-{
-        i2c_del_driver(&ucd9000_driver);
-}
+module_i2c_driver(ucd9000_driver);
 
 MODULE_AUTHOR("Guenter Roeck");
 MODULE_DESCRIPTION("PMBus driver for TI UCD90xxx");
 MODULE_LICENSE("GPL");
-module_init(ucd9000_init);
-module_exit(ucd9000_exit);