hwmon: Add static visibility member to struct hwmon_ops
PATCH v2 1/1 hwmon: Add static visibility member to struct hwmon_ops
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 <[email protected]>
---
v2:
- improved is_visible description
--- drivers/hwmon/hwmon.c | 19 +++++++++++++++---- include/linux/hwmon.h | 5 ++++- 2 files changed, 19 insertions(+), 5 deletions(-)
drivers/hwmon/hwmon.c +15 -4
@@ -145,6 +145,17 @@ static const struct class hwmon_class = {static DEFINE_IDA (hwmon_ida); +static umode_t hwmon_ops_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 */ /*
@@ -267,8 +278,8 @@ static int hwmon_thermal_register_sensors(struct device *dev)int err;if (!(info[i]->config[j] &HWMON_T_INPUT ) || - !chip->ops->is_visible (drvdata, hwmon_temp, - hwmon_temp_input, j)) + !hwmon_ops_is_visible (chip->ops, drvdata, hwmon_temp, + hwmon_temp_input, j))continue ; err =hwmon_thermal_add_sensor (dev, j);
@@ -506,7 +517,7 @@ static struct attribute *hwmon_genattr(const void *drvdata,const char *name;bool is_string =is_string_attr (type, attr); - mode = ops->is_visible (drvdata, type, attr, index); + mode =hwmon_ops_is_visible (ops, drvdata, type, attr, index);if (!mode)return ERR_PTR (-ENOENT );
@@ -1033,7 +1044,7 @@ hwmon_device_register_with_info(struct device *dev, const char *name,if (!dev || !name || !chip)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 __hwmon_device_register (dev, name, drvdata, chip, extra_groups);
include/linux/hwmon.h +4 -1
@@ -368,7 +368,9 @@ enum hwmon_intrusion_attributes {/** * 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: * @const void *drvdata: * 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. */ struct hwmon_ops { +umode_t visible;umode_t (*is_visible)(const void *drvdata,enum hwmon_sensor_types type,u32 attr,int channel); int (*read)(struct device *dev, enum hwmon_sensor_types type,
Signature · 1 line
2.47.0
Quoted 6 lines · Heiner Kallweit
Several drivers return the same static value in their
is_visiblecallback, what results in code duplication. Therefore add an option for drivers to specify a static visibility directly.Signed-off-by Heiner Kallweit <[email protected]>---
Applied, with a minor twist: I renamed hwmon_ops_is_visible to hwmon_is_visible since the _ops in the function name does not really add any value.
Thanks,
Guenter