Revert "hwmon: Make chip parameter for with_info API mandatory"
This reverts commit 1ec0bc72f5
which is
commit ddaefa209c4ac791c1262e97c9b2d0440c8ef1d5 upstream. It should not
have been applied to the stable trees.
Link: https://lore.kernel.org/r/20220622154454.GA1864037@roeck-us.net
Reported-by: Julian Haller <julian.haller@philips.com>
Reported-by: Guenter Roeck <linux@roeck-us.net>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
7b9c3bfbad
commit
3994d2ee55
@ -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
|
to register a hardware monitoring device. It creates the standard sysfs
|
||||||
attributes in the hardware monitoring core, letting the driver focus on reading
|
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.
|
from and writing to the chip instead of having to bother with sysfs attributes.
|
||||||
The parent device parameter as well as the chip parameter must not be NULL. Its
|
The parent device parameter cannot be NULL with non-NULL chip info. Its
|
||||||
parameters are described in more detail below.
|
parameters are described in more detail below.
|
||||||
|
|
||||||
devm_hwmon_device_register_with_info is similar to
|
devm_hwmon_device_register_with_info is similar to
|
||||||
|
@ -715,12 +715,11 @@ EXPORT_SYMBOL_GPL(hwmon_device_register_with_groups);
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* hwmon_device_register_with_info - register w/ hwmon
|
* hwmon_device_register_with_info - register w/ hwmon
|
||||||
* @dev: the parent device (mandatory)
|
* @dev: the parent device
|
||||||
* @name: hwmon name attribute (mandatory)
|
* @name: hwmon name attribute
|
||||||
* @drvdata: driver data to attach to created device (optional)
|
* @drvdata: driver data to attach to created device
|
||||||
* @chip: pointer to hwmon chip information (mandatory)
|
* @chip: pointer to hwmon chip information
|
||||||
* @extra_groups: pointer to list of additional non-standard attribute groups
|
* @extra_groups: pointer to list of additional non-standard attribute groups
|
||||||
* (optional)
|
|
||||||
*
|
*
|
||||||
* hwmon_device_unregister() must be called when the device is no
|
* hwmon_device_unregister() must be called when the device is no
|
||||||
* longer needed.
|
* longer needed.
|
||||||
@ -733,10 +732,13 @@ 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 (!dev || !name || !chip)
|
if (!name)
|
||||||
return ERR_PTR(-EINVAL);
|
return ERR_PTR(-EINVAL);
|
||||||
|
|
||||||
if (!chip->ops || !chip->ops->is_visible || !chip->info)
|
if (chip && (!chip->ops || !chip->ops->is_visible || !chip->info))
|
||||||
|
return ERR_PTR(-EINVAL);
|
||||||
|
|
||||||
|
if (chip && !dev)
|
||||||
return ERR_PTR(-EINVAL);
|
return ERR_PTR(-EINVAL);
|
||||||
|
|
||||||
return __hwmon_device_register(dev, name, drvdata, chip, extra_groups);
|
return __hwmon_device_register(dev, name, drvdata, chip, extra_groups);
|
||||||
|
Loading…
Reference in New Issue
Block a user