Skip to content

Commit

Permalink
hwmon: Make chip parameter for with_info API mandatory
Browse files Browse the repository at this point in the history
[ Upstream commit ddaefa2 ]

Various attempts were made recently to "convert" the old
hwmon_device_register() API to devm_hwmon_device_register_with_info()
by just changing the function name without actually converting the
driver. Prevent this from happening by making the 'chip' parameter of
devm_hwmon_device_register_with_info() mandatory.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Guenter Roeck authored and Greg Kroah-Hartman committed Jun 14, 2022
1 parent a7a41dd commit 1ec0bc7
Showing 2 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Documentation/hwmon/hwmon-kernel-api.rst
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ hwmon_device_register_with_info is the most comprehensive and preferred means
to register a hardware monitoring device. It creates the standard sysfs
attributes in the hardware monitoring core, letting the driver focus on reading
from and writing to the chip instead of having to bother with sysfs attributes.
The parent device parameter cannot be NULL with non-NULL chip info. Its
The parent device parameter as well as the chip parameter must not be NULL. Its
parameters are described in more detail below.

devm_hwmon_device_register_with_info is similar to
16 changes: 7 additions & 9 deletions drivers/hwmon/hwmon.c
Original file line number Diff line number Diff line change
@@ -715,11 +715,12 @@ EXPORT_SYMBOL_GPL(hwmon_device_register_with_groups);

/**
* hwmon_device_register_with_info - register w/ hwmon
* @dev: the parent device
* @name: hwmon name attribute
* @drvdata: driver data to attach to created device
* @chip: pointer to hwmon chip information
* @dev: the parent device (mandatory)
* @name: hwmon name attribute (mandatory)
* @drvdata: driver data to attach to created device (optional)
* @chip: pointer to hwmon chip information (mandatory)
* @extra_groups: pointer to list of additional non-standard attribute groups
* (optional)
*
* hwmon_device_unregister() must be called when the device is no
* longer needed.
@@ -732,13 +733,10 @@ 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))
if (!dev || !name || !chip)
return ERR_PTR(-EINVAL);

if (chip && !dev)
if (!chip->ops || !chip->ops->is_visible || !chip->info)
return ERR_PTR(-EINVAL);

return __hwmon_device_register(dev, name, drvdata, chip, extra_groups);

0 comments on commit 1ec0bc7

Please sign in to comment.