hwmon: Fix unchecked return status, batch 2

hwmon: Fix unchecked return status, batch 2

Fix up some hwmon drivers so that they no longer ignore return status
from device_create_file().

Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 139 insertions, 52 deletions

diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index e6c1b638c971..3ce825489e34 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -542,6 +542,78 @@ static int lm87_attach_adapter(struct i2c_adapter *adapter)
         return i2c_probe(adapter, &addr_data, lm87_detect);
 }
 
+static struct attribute *lm87_attributes[] = {
+        &dev_attr_in1_input.attr,
+        &dev_attr_in1_min.attr,
+        &dev_attr_in1_max.attr,
+        &dev_attr_in2_input.attr,
+        &dev_attr_in2_min.attr,
+        &dev_attr_in2_max.attr,
+        &dev_attr_in3_input.attr,
+        &dev_attr_in3_min.attr,
+        &dev_attr_in3_max.attr,
+        &dev_attr_in4_input.attr,
+        &dev_attr_in4_min.attr,
+        &dev_attr_in4_max.attr,
+
+        &dev_attr_temp1_input.attr,
+        &dev_attr_temp1_max.attr,
+        &dev_attr_temp1_min.attr,
+        &dev_attr_temp1_crit.attr,
+        &dev_attr_temp2_input.attr,
+        &dev_attr_temp2_max.attr,
+        &dev_attr_temp2_min.attr,
+        &dev_attr_temp2_crit.attr,
+
+        &dev_attr_alarms.attr,
+        &dev_attr_aout_output.attr,
+
+        NULL
+};
+
+static const struct attribute_group lm87_group = {
+        .attrs = lm87_attributes,
+};
+
+static struct attribute *lm87_attributes_opt[] = {
+        &dev_attr_in6_input.attr,
+        &dev_attr_in6_min.attr,
+        &dev_attr_in6_max.attr,
+
+        &dev_attr_fan1_input.attr,
+        &dev_attr_fan1_min.attr,
+        &dev_attr_fan1_div.attr,
+
+        &dev_attr_in7_input.attr,
+        &dev_attr_in7_min.attr,
+        &dev_attr_in7_max.attr,
+
+        &dev_attr_fan2_input.attr,
+        &dev_attr_fan2_min.attr,
+        &dev_attr_fan2_div.attr,
+
+        &dev_attr_temp3_input.attr,
+        &dev_attr_temp3_max.attr,
+        &dev_attr_temp3_min.attr,
+        &dev_attr_temp3_crit.attr,
+
+        &dev_attr_in0_input.attr,
+        &dev_attr_in0_min.attr,
+        &dev_attr_in0_max.attr,
+        &dev_attr_in5_input.attr,
+        &dev_attr_in5_min.attr,
+        &dev_attr_in5_max.attr,
+
+        &dev_attr_cpu0_vid.attr,
+        &dev_attr_vrm.attr,
+
+        NULL
+};
+
+static const struct attribute_group lm87_group_opt = {
+        .attrs = lm87_attributes_opt,
+};
+
 /*
  * The following function does more than just detection. If detection
  * succeeds, it also registers the new chip.
@@ -609,77 +681,90 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
         data->in_scale[7] = 1875;
 
         /* Register sysfs hooks */
-        data->class_dev = hwmon_device_register(&new_client->dev);
-        if (IS_ERR(data->class_dev)) {
-                err = PTR_ERR(data->class_dev);
+        if ((err = sysfs_create_group(&new_client->dev.kobj, &lm87_group)))
                 goto exit_detach;
-        }
-
-        device_create_file(&new_client->dev, &dev_attr_in1_input);
-        device_create_file(&new_client->dev, &dev_attr_in1_min);
-        device_create_file(&new_client->dev, &dev_attr_in1_max);
-        device_create_file(&new_client->dev, &dev_attr_in2_input);
-        device_create_file(&new_client->dev, &dev_attr_in2_min);
-        device_create_file(&new_client->dev, &dev_attr_in2_max);
-        device_create_file(&new_client->dev, &dev_attr_in3_input);
-        device_create_file(&new_client->dev, &dev_attr_in3_min);
-        device_create_file(&new_client->dev, &dev_attr_in3_max);
-        device_create_file(&new_client->dev, &dev_attr_in4_input);
-        device_create_file(&new_client->dev, &dev_attr_in4_min);
-        device_create_file(&new_client->dev, &dev_attr_in4_max);
 
         if (data->channel & CHAN_NO_FAN(0)) {
-                device_create_file(&new_client->dev, &dev_attr_in6_input);
-                device_create_file(&new_client->dev, &dev_attr_in6_min);
-                device_create_file(&new_client->dev, &dev_attr_in6_max);
+                if ((err = device_create_file(&new_client->dev,
+                                        &dev_attr_in6_input))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_in6_min))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_in6_max)))
+                        goto exit_remove;
         } else {
-                device_create_file(&new_client->dev, &dev_attr_fan1_input);
-                device_create_file(&new_client->dev, &dev_attr_fan1_min);
-                device_create_file(&new_client->dev, &dev_attr_fan1_div);
+                if ((err = device_create_file(&new_client->dev,
+                                        &dev_attr_fan1_input))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_fan1_min))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_fan1_div)))
+                        goto exit_remove;
         }
+
         if (data->channel & CHAN_NO_FAN(1)) {
-                device_create_file(&new_client->dev, &dev_attr_in7_input);
-                device_create_file(&new_client->dev, &dev_attr_in7_min);
-                device_create_file(&new_client->dev, &dev_attr_in7_max);
+                if ((err = device_create_file(&new_client->dev,
+                                        &dev_attr_in7_input))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_in7_min))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_in7_max)))
+                        goto exit_remove;
         } else {
-                device_create_file(&new_client->dev, &dev_attr_fan2_input);
-                device_create_file(&new_client->dev, &dev_attr_fan2_min);
-                device_create_file(&new_client->dev, &dev_attr_fan2_div);
+                if ((err = device_create_file(&new_client->dev,
+                                        &dev_attr_fan2_input))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_fan2_min))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_fan2_div)))
+                        goto exit_remove;
         }
 
-        device_create_file(&new_client->dev, &dev_attr_temp1_input);
-        device_create_file(&new_client->dev, &dev_attr_temp1_max);
-        device_create_file(&new_client->dev, &dev_attr_temp1_min);
-        device_create_file(&new_client->dev, &dev_attr_temp1_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp2_input);
-        device_create_file(&new_client->dev, &dev_attr_temp2_max);
-        device_create_file(&new_client->dev, &dev_attr_temp2_min);
-        device_create_file(&new_client->dev, &dev_attr_temp2_crit);
-
         if (data->channel & CHAN_TEMP3) {
-                device_create_file(&new_client->dev, &dev_attr_temp3_input);
-                device_create_file(&new_client->dev, &dev_attr_temp3_max);
-                device_create_file(&new_client->dev, &dev_attr_temp3_min);
-                device_create_file(&new_client->dev, &dev_attr_temp3_crit);
+                if ((err = device_create_file(&new_client->dev,
+                                        &dev_attr_temp3_input))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_temp3_max))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_temp3_min))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_temp3_crit)))
+                        goto exit_remove;
         } else {
-                device_create_file(&new_client->dev, &dev_attr_in0_input);
-                device_create_file(&new_client->dev, &dev_attr_in0_min);
-                device_create_file(&new_client->dev, &dev_attr_in0_max);
-                device_create_file(&new_client->dev, &dev_attr_in5_input);
-                device_create_file(&new_client->dev, &dev_attr_in5_min);
-                device_create_file(&new_client->dev, &dev_attr_in5_max);
+                if ((err = device_create_file(&new_client->dev,
+                                        &dev_attr_in0_input))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_in0_min))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_in0_max))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_in5_input))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_in5_min))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_in5_max)))
+                        goto exit_remove;
         }
 
         if (!(data->channel & CHAN_NO_VID)) {
-                device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
-                device_create_file(&new_client->dev, &dev_attr_vrm);
+                if ((err = device_create_file(&new_client->dev,
+                                        &dev_attr_cpu0_vid))
+                 || (err = device_create_file(&new_client->dev,
+                                        &dev_attr_vrm)))
+                        goto exit_remove;
         }
 
-        device_create_file(&new_client->dev, &dev_attr_alarms);
-        device_create_file(&new_client->dev, &dev_attr_aout_output);
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_remove;
+        }
 
         return 0;
 
+exit_remove:
+        sysfs_remove_group(&new_client->dev.kobj, &lm87_group);
+        sysfs_remove_group(&new_client->dev.kobj, &lm87_group_opt);
 exit_detach:
         i2c_detach_client(new_client);
 exit_free:
@@ -732,6 +817,8 @@ static int lm87_detach_client(struct i2c_client *client)
         int err;
 
         hwmon_device_unregister(data->class_dev);
+        sysfs_remove_group(&client->dev.kobj, &lm87_group);
+        sysfs_remove_group(&client->dev.kobj, &lm87_group_opt);
 
         if ((err = i2c_detach_client(client)))
                 return err;