hwmon: Make name attribute mandatory for new APIs
authorGuenter Roeck <linux@roeck-us.net>
Tue, 24 Jan 2017 14:32:57 +0000 (06:32 -0800)
committerGuenter Roeck <linux@roeck-us.net>
Wed, 25 Jan 2017 14:14:26 +0000 (06:14 -0800)
It does not make sense to use one of the the new APIs when not
even providing a name attribute. Make it mandatory.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/hwmon.c

index 0c5660c..affff81 100644 (file)
@@ -651,6 +651,9 @@ hwmon_device_register_with_groups(struct device *dev, const char *name,
                                  void *drvdata,
                                  const struct attribute_group **groups)
 {
+       if (!name)
+               return ERR_PTR(-EINVAL);
+
        return __hwmon_device_register(dev, name, drvdata, NULL, groups);
 }
 EXPORT_SYMBOL_GPL(hwmon_device_register_with_groups);
@@ -674,6 +677,9 @@ hwmon_device_register_with_info(struct device *dev, const char *name,
                                const struct hwmon_chip_info *chip,
                                const struct attribute_group **extra_groups)
 {
+       if (!name)
+               return ERR_PTR(-EINVAL);
+
        if (chip && (!chip->ops || !chip->ops->is_visible || !chip->info))
                return ERR_PTR(-EINVAL);
 
@@ -695,7 +701,7 @@ struct device *hwmon_device_register(struct device *dev)
        dev_warn(dev,
                 "hwmon_device_register() is deprecated. Please convert the driver to use hwmon_device_register_with_info().\n");
 
-       return hwmon_device_register_with_groups(dev, NULL, NULL, NULL);
+       return __hwmon_device_register(dev, NULL, NULL, NULL, NULL);
 }
 EXPORT_SYMBOL_GPL(hwmon_device_register);