Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 09:16:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hwmon: Add static visibility member to struct hwmon_ops

Browse Source 
Several drivers return the same static value in their is_visible
callback, what results in code duplication. Therefore add an option
for drivers to specify a static visibility directly.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Message-ID: <89690b81-2c73-47ae-9ae9-45c77b45ca0c@gmail.com>
groeck: Renamed hwmon_ops_is_visible -> hwmon_is_visible
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Heiner Kallweit 2024-10-10 21:35:42 +02:00 committed by Guenter Roeck
parent edeed7b666
commit 79bc0af904
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/hwmon/hwmon.c
View File

@ -145,6 +145,17 @@ static const struct class hwmon_class = {
static DEFINE_IDA(hwmon_ida); static DEFINE_IDA(hwmon_ida);
static umode_t hwmon_is_visible(const struct hwmon_ops *ops,
const void *drvdata,
enum hwmon_sensor_types type,
u32 attr, int channel)
{
if (ops->visible)
return ops->visible;
return ops->is_visible(drvdata, type, attr, channel);
}
/* Thermal zone handling */ /* Thermal zone handling */
/* /*
@ -267,8 +278,8 @@ static int hwmon_thermal_register_sensors(struct device *dev)
int err; int err;
if (!(info[i]->config[j] & HWMON_T_INPUT) || if (!(info[i]->config[j] & HWMON_T_INPUT) ||
!chip->ops->is_visible(drvdata, hwmon_temp, !hwmon_is_visible(chip->ops, drvdata, hwmon_temp,
hwmon_temp_input, j)) hwmon_temp_input, j))
continue; continue;
err = hwmon_thermal_add_sensor(dev, j); err = hwmon_thermal_add_sensor(dev, j);
@ -506,7 +517,7 @@ static struct attribute *hwmon_genattr(const void *drvdata,
const char *name; const char *name;
bool is_string = is_string_attr(type, attr); bool is_string = is_string_attr(type, attr);
mode = ops->is_visible(drvdata, type, attr, index); mode = hwmon_is_visible(ops, drvdata, type, attr, index);
if (!mode) if (!mode)
return ERR_PTR(-ENOENT); return ERR_PTR(-ENOENT);
@ -1033,7 +1044,7 @@ hwmon_device_register_with_info(struct device *dev, const char *name,
if (!dev || !name || !chip) if (!dev || !name || !chip)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
if (!chip->ops || !chip->ops->is_visible || !chip->info) if (!chip->ops || !(chip->ops->visible || chip->ops->is_visible) || !chip->info)
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);

5
include/linux/hwmon.h
View File

@ -368,7 +368,9 @@ enum hwmon_intrusion_attributes {
/** /**
* struct hwmon_ops - hwmon device operations * struct hwmon_ops - hwmon device operations
* @is_visible: Callback to return attribute visibility. Mandatory. * @visible: Static visibility. If non-zero, 'is_visible' is ignored.
* @is_visible: Callback to return attribute visibility. Mandatory unless
* 'visible' is non-zero.
* Parameters are: * Parameters are:
* @const void *drvdata: * @const void *drvdata:
* Pointer to driver-private data structure passed * Pointer to driver-private data structure passed
@ -412,6 +414,7 @@ enum hwmon_intrusion_attributes {
* The function returns 0 on success or a negative error number. * The function returns 0 on success or a negative error number.
*/ */
struct hwmon_ops { struct hwmon_ops {
umode_t visible;
umode_t (*is_visible)(const void *drvdata, enum hwmon_sensor_types type, umode_t (*is_visible)(const void *drvdata, enum hwmon_sensor_types type,
u32 attr, int channel); u32 attr, int channel);
int (*read)(struct device *dev, enum hwmon_sensor_types type, int (*read)(struct device *dev, enum hwmon_sensor_types type,