mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
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: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
parent
68f0c8c923
commit
8353863a52
1 changed files with 7 additions and 1 deletions
|
@ -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,
|
||||||
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)
|
||||||
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);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue