In the next patch a power supply extension is added which requires
a name attribute. Instead of creating another const macro with the
same information, replace LWMI_OM_FW_ATTR_BASE_PATH with
LWMI_OM_NAME and use that for firmware attributes and power supply
extension.
Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
Signed-off-by: Derek J. Clark <derekjohn.clark@gmail.com>
---
drivers/platform/x86/lenovo/wmi-other.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c
index 67768f6a50e0..7f0d5a17b44f 100644
--- a/drivers/platform/x86/lenovo/wmi-other.c
+++ b/drivers/platform/x86/lenovo/wmi-other.c
@@ -90,13 +90,13 @@ enum lwmi_feature_id_gpu {
#define LWMI_FAN_NR 4
#define LWMI_FAN_ID(x) ((x) + LWMI_FAN_ID_BASE)
+#define LWMI_FAN_DIV 100
+
#define LWMI_ATTR_ID_FAN_RPM(x) \
LWMI_ATTR_ID(LWMI_DEVICE_ID_FAN, LWMI_FEATURE_ID_FAN_RPM, \
LWMI_GZ_THERMAL_MODE_NONE, LWMI_FAN_ID(x))
-#define LWMI_FAN_DIV 100
-
-#define LWMI_OM_FW_ATTR_BASE_PATH "lenovo-wmi-other"
+#define LWMI_OM_SYSFS_NAME "lenovo-wmi-other"
#define LWMI_OM_HWMON_NAME "lenovo_wmi_other"
static BLOCKING_NOTIFIER_HEAD(om_chain_head);
@@ -1233,8 +1233,7 @@ static int lwmi_om_fw_attr_add(struct lwmi_om_priv *priv)
priv->fw_attr_dev = device_create(&firmware_attributes_class, NULL,
MKDEV(0, 0), NULL, "%s-%u",
- LWMI_OM_FW_ATTR_BASE_PATH,
- priv->ida_id);
+ LWMI_OM_SYSFS_NAME, priv->ida_id);
if (IS_ERR(priv->fw_attr_dev)) {
err = PTR_ERR(priv->fw_attr_dev);
goto err_free_ida;
--
2.52.0
Hi Derek,
On Tue, 2026-02-24 at 04:31 +0000, Derek J. Clark wrote:
> In the next patch a power supply extension is added which requires
> a name attribute. Instead of creating another const macro with the
> same information, replace LWMI_OM_FW_ATTR_BASE_PATH with
> LWMI_OM_NAME and use that for firmware attributes and power supply
> extension.
>
> Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
> Signed-off-by: Derek J. Clark <derekjohn.clark@gmail.com>
> ---
> drivers/platform/x86/lenovo/wmi-other.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c
> index 67768f6a50e0..7f0d5a17b44f 100644
> --- a/drivers/platform/x86/lenovo/wmi-other.c
> +++ b/drivers/platform/x86/lenovo/wmi-other.c
> @@ -90,13 +90,13 @@ enum lwmi_feature_id_gpu {
> #define LWMI_FAN_NR 4
> #define LWMI_FAN_ID(x) ((x) + LWMI_FAN_ID_BASE)
>
> +#define LWMI_FAN_DIV 100
> +
> #define LWMI_ATTR_ID_FAN_RPM(x) \
> LWMI_ATTR_ID(LWMI_DEVICE_ID_FAN, LWMI_FEATURE_ID_FAN_RPM, \
> LWMI_GZ_THERMAL_MODE_NONE, LWMI_FAN_ID(x))
>
> -#define LWMI_FAN_DIV 100
I placed it here intentionally as it has nothing to do with
LWMI_ATTR_ID (contrary to other fan-related macros) and is just a
descriptive macro.
> -
> -#define LWMI_OM_FW_ATTR_BASE_PATH "lenovo-wmi-other"
> +#define LWMI_OM_SYSFS_NAME "lenovo-wmi-other"
> #define LWMI_OM_HWMON_NAME "lenovo_wmi_other"
>
> static BLOCKING_NOTIFIER_HEAD(om_chain_head);
> @@ -1233,8 +1233,7 @@ static int lwmi_om_fw_attr_add(struct lwmi_om_priv *priv)
>
> priv->fw_attr_dev = device_create(&firmware_attributes_class, NULL,
> MKDEV(0, 0), NULL, "%s-%u",
> - LWMI_OM_FW_ATTR_BASE_PATH,
> - priv->ida_id);
> + LWMI_OM_SYSFS_NAME, priv->ida_id);
> if (IS_ERR(priv->fw_attr_dev)) {
> err = PTR_ERR(priv->fw_attr_dev);
> goto err_free_ida;
Thanks,
Rong
On February 25, 2026 9:25:45 AM PST, Rong Zhang <i@rong.moe> wrote:
>Hi Derek,
>
>On Tue, 2026-02-24 at 04:31 +0000, Derek J. Clark wrote:
>> In the next patch a power supply extension is added which requires
>> a name attribute. Instead of creating another const macro with the
>> same information, replace LWMI_OM_FW_ATTR_BASE_PATH with
>> LWMI_OM_NAME and use that for firmware attributes and power supply
>> extension.
>>
>> Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
>> Signed-off-by: Derek J. Clark <derekjohn.clark@gmail.com>
>> ---
>> drivers/platform/x86/lenovo/wmi-other.c | 9 ++++-----
>> 1 file changed, 4 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c
>> index 67768f6a50e0..7f0d5a17b44f 100644
>> --- a/drivers/platform/x86/lenovo/wmi-other.c
>> +++ b/drivers/platform/x86/lenovo/wmi-other.c
>> @@ -90,13 +90,13 @@ enum lwmi_feature_id_gpu {
>> #define LWMI_FAN_NR 4
>> #define LWMI_FAN_ID(x) ((x) + LWMI_FAN_ID_BASE)
>>
>> +#define LWMI_FAN_DIV 100
>> +
>> #define LWMI_ATTR_ID_FAN_RPM(x) \
>> LWMI_ATTR_ID(LWMI_DEVICE_ID_FAN, LWMI_FEATURE_ID_FAN_RPM, \
>> LWMI_GZ_THERMAL_MODE_NONE, LWMI_FAN_ID(x))
>>
>> -#define LWMI_FAN_DIV 100
>
>I placed it here intentionally as it has nothing to do with
>LWMI_ATTR_ID (contrary to other fan-related macros) and is just a
>descriptive macro.
Understandable. I think it makes sense to keep the fan related defines all together since I'll be adding additional LWMI_ATTR_ID defines here later.
>> -
>> -#define LWMI_OM_FW_ATTR_BASE_PATH "lenovo-wmi-other"
>> +#define LWMI_OM_SYSFS_NAME "lenovo-wmi-other"
>> #define LWMI_OM_HWMON_NAME "lenovo_wmi_other"
>>
>> static BLOCKING_NOTIFIER_HEAD(om_chain_head);
>> @@ -1233,8 +1233,7 @@ static int lwmi_om_fw_attr_add(struct lwmi_om_priv *priv)
>>
>> priv->fw_attr_dev = device_create(&firmware_attributes_class, NULL,
>> MKDEV(0, 0), NULL, "%s-%u",
>> - LWMI_OM_FW_ATTR_BASE_PATH,
>> - priv->ida_id);
>> + LWMI_OM_SYSFS_NAME, priv->ida_id);
>> if (IS_ERR(priv->fw_attr_dev)) {
>> err = PTR_ERR(priv->fw_attr_dev);
>> goto err_free_ida;
>
>Thanks,
>Rong
On Tue, 24 Feb 2026, Derek J. Clark wrote:
> In the next patch a power supply extension is added which requires
> a name attribute. Instead of creating another const macro with the
> same information, replace LWMI_OM_FW_ATTR_BASE_PATH with
> LWMI_OM_NAME and use that for firmware attributes and power supply
This doesn't match the code change??
> extension.
>
> Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
> Signed-off-by: Derek J. Clark <derekjohn.clark@gmail.com>
> ---
> drivers/platform/x86/lenovo/wmi-other.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c
> index 67768f6a50e0..7f0d5a17b44f 100644
> --- a/drivers/platform/x86/lenovo/wmi-other.c
> +++ b/drivers/platform/x86/lenovo/wmi-other.c
> @@ -90,13 +90,13 @@ enum lwmi_feature_id_gpu {
> #define LWMI_FAN_NR 4
> #define LWMI_FAN_ID(x) ((x) + LWMI_FAN_ID_BASE)
>
> +#define LWMI_FAN_DIV 100
> +
> #define LWMI_ATTR_ID_FAN_RPM(x) \
> LWMI_ATTR_ID(LWMI_DEVICE_ID_FAN, LWMI_FEATURE_ID_FAN_RPM, \
> LWMI_GZ_THERMAL_MODE_NONE, LWMI_FAN_ID(x))
>
> -#define LWMI_FAN_DIV 100
Unrelated change.
> -
> -#define LWMI_OM_FW_ATTR_BASE_PATH "lenovo-wmi-other"
> +#define LWMI_OM_SYSFS_NAME "lenovo-wmi-other"
> #define LWMI_OM_HWMON_NAME "lenovo_wmi_other"
>
> static BLOCKING_NOTIFIER_HEAD(om_chain_head);
> @@ -1233,8 +1233,7 @@ static int lwmi_om_fw_attr_add(struct lwmi_om_priv *priv)
>
> priv->fw_attr_dev = device_create(&firmware_attributes_class, NULL,
> MKDEV(0, 0), NULL, "%s-%u",
> - LWMI_OM_FW_ATTR_BASE_PATH,
> - priv->ida_id);
> + LWMI_OM_SYSFS_NAME, priv->ida_id);
> if (IS_ERR(priv->fw_attr_dev)) {
> err = PTR_ERR(priv->fw_attr_dev);
> goto err_free_ida;
>
--
i.
On February 24, 2026 12:51:09 AM PST, "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com> wrote:
>On Tue, 24 Feb 2026, Derek J. Clark wrote:
>
>> In the next patch a power supply extension is added which requires
>> a name attribute. Instead of creating another const macro with the
>> same information, replace LWMI_OM_FW_ATTR_BASE_PATH with
>> LWMI_OM_NAME and use that for firmware attributes and power supply
>
>This doesn't match the code change??
Woops, sorry, I forgot to update the variable name in the commit message after I changed it.
Thanks.
>> extension.
>>
>> Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
>> Signed-off-by: Derek J. Clark <derekjohn.clark@gmail.com>
>> ---
>> drivers/platform/x86/lenovo/wmi-other.c | 9 ++++-----
>> 1 file changed, 4 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/platform/x86/lenovo/wmi-other.c b/drivers/platform/x86/lenovo/wmi-other.c
>> index 67768f6a50e0..7f0d5a17b44f 100644
>> --- a/drivers/platform/x86/lenovo/wmi-other.c
>> +++ b/drivers/platform/x86/lenovo/wmi-other.c
>> @@ -90,13 +90,13 @@ enum lwmi_feature_id_gpu {
>> #define LWMI_FAN_NR 4
>> #define LWMI_FAN_ID(x) ((x) + LWMI_FAN_ID_BASE)
>>
>> +#define LWMI_FAN_DIV 100
>> +
>> #define LWMI_ATTR_ID_FAN_RPM(x) \
>> LWMI_ATTR_ID(LWMI_DEVICE_ID_FAN, LWMI_FEATURE_ID_FAN_RPM, \
>> LWMI_GZ_THERMAL_MODE_NONE, LWMI_FAN_ID(x))
>>
>> -#define LWMI_FAN_DIV 100
>
>Unrelated change.
>
>> -
>> -#define LWMI_OM_FW_ATTR_BASE_PATH "lenovo-wmi-other"
>> +#define LWMI_OM_SYSFS_NAME "lenovo-wmi-other"
>> #define LWMI_OM_HWMON_NAME "lenovo_wmi_other"
>>
>> static BLOCKING_NOTIFIER_HEAD(om_chain_head);
>> @@ -1233,8 +1233,7 @@ static int lwmi_om_fw_attr_add(struct lwmi_om_priv *priv)
>>
>> priv->fw_attr_dev = device_create(&firmware_attributes_class, NULL,
>> MKDEV(0, 0), NULL, "%s-%u",
>> - LWMI_OM_FW_ATTR_BASE_PATH,
>> - priv->ida_id);
>> + LWMI_OM_SYSFS_NAME, priv->ida_id);
>> if (IS_ERR(priv->fw_attr_dev)) {
>> err = PTR_ERR(priv->fw_attr_dev);
>> goto err_free_ida;
>>
>
© 2016 - 2026 Red Hat, Inc.