Commit 8353863a authored by Guenter Roeck's avatar Guenter Roeck

hwmon: Make name attribute mandatory for new APIs

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: default avatarJean Delvare <jdelvare@suse.de>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 68f0c8c9
...@@ -651,6 +651,9 @@ hwmon_device_register_with_groups(struct device *dev, const char *name, ...@@ -651,6 +651,9 @@ hwmon_device_register_with_groups(struct device *dev, const char *name,
void *drvdata, void *drvdata,
const struct attribute_group **groups) const struct attribute_group **groups)
{ {
if (!name)
return ERR_PTR(-EINVAL);
return __hwmon_device_register(dev, name, drvdata, NULL, groups); return __hwmon_device_register(dev, name, drvdata, NULL, groups);
} }
EXPORT_SYMBOL_GPL(hwmon_device_register_with_groups); EXPORT_SYMBOL_GPL(hwmon_device_register_with_groups);
...@@ -674,6 +677,9 @@ hwmon_device_register_with_info(struct device *dev, const char *name, ...@@ -674,6 +677,9 @@ hwmon_device_register_with_info(struct device *dev, const char *name,
const struct hwmon_chip_info *chip, const struct hwmon_chip_info *chip,
const struct attribute_group **extra_groups) const struct attribute_group **extra_groups)
{ {
if (!name)
return ERR_PTR(-EINVAL);
if (chip && (!chip->ops || !chip->ops->is_visible || !chip->info)) if (chip && (!chip->ops || !chip->ops->is_visible || !chip->info))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
...@@ -695,7 +701,7 @@ struct device *hwmon_device_register(struct device *dev) ...@@ -695,7 +701,7 @@ struct device *hwmon_device_register(struct device *dev)
dev_warn(dev, dev_warn(dev,
"hwmon_device_register() is deprecated. Please convert the driver to use hwmon_device_register_with_info().\n"); "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); EXPORT_SYMBOL_GPL(hwmon_device_register);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment