Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ec0bc72 authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman
Browse files

hwmon: Make chip parameter for with_info API mandatory 



[ Upstream commit ddaefa209c4ac791c1262e97c9b2d0440c8ef1d5 ]

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: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a7a41dd4

Documentation/hwmon/hwmon-kernel-api.rst

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/hwmon/hwmon.c

+7 −9
Original line number Diff line number Diff line
@@ -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);