From: Mark Pearson <mpearson-lenovo@squebb.ca>
To: mpearson-lenovo@squebb.ca
Cc: hdegoede@redhat.com, markgross@kernel.org,
markpearson@lenovo.com, thomas@t-8ch.de, pobrn@protonmail.com,
linux-kernel@vger.kernel.org,
"Thomas Weißschuh" <linux@weissschuh.net>
Subject: [PATCH v4 2/4] platform/x86: think-lmi: use correct possible_values delimiters
Date: Sun, 19 Mar 2023 20:32:19 -0400 [thread overview]
Message-ID: <20230320003221.561750-2-mpearson-lenovo@squebb.ca> (raw)
In-Reply-To: <20230320003221.561750-1-mpearson-lenovo@squebb.ca>
firmware-attributes class requires that possible values are delimited
using ';' but the Lenovo firmware uses ',' instead.
Parse string and replace where appropriate.
Suggested-by: Thomas Weißschuh <linux@weissschuh.net>
Fixes: a40cd7ef22fb ("platform/x86: think-lmi: Add WMI interface support on Lenovo platforms")
Signed-off-by: Mark Pearson <mpearson-lenovo@squebb.ca>
---
Changes in v4
- Moved earlier in the series as recommended
- used strreplace function as recommended
Changes in v3:
- New patch added to the series. No v1 & v2.
drivers/platform/x86/think-lmi.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
index a765bf8c27d8..53f34b1adb8c 100644
--- a/drivers/platform/x86/think-lmi.c
+++ b/drivers/platform/x86/think-lmi.c
@@ -954,7 +954,7 @@ static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr,
if (setting->possible_values) {
/* Figure out what setting type is as BIOS does not return this */
- if (strchr(setting->possible_values, ','))
+ if (strchr(setting->possible_values, ';'))
return sysfs_emit(buf, "enumeration\n");
}
/* Anything else is going to be a string */
@@ -1413,6 +1413,13 @@ static int tlmi_analyze(void)
pr_info("Error retrieving possible values for %d : %s\n",
i, setting->display_name);
}
+ /*
+ * firmware-attributes requires that possible_values are separated by ';' but
+ * Lenovo FW uses ','. Replace appropriately.
+ */
+ if (setting->possible_values)
+ strreplace(setting->possible_values, ',', ';');
+
kobject_init(&setting->kobj, &tlmi_attr_setting_ktype);
tlmi_priv.setting[i] = setting;
kfree(item);
--
2.39.2
next prev parent reply other threads:[~2023-03-20 0:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-20 0:32 [PATCH v4 1/4] platform/x86: think-lmi: add missing type attribute Mark Pearson
2023-03-20 0:32 ` Mark Pearson [this message]
2023-03-20 15:22 ` [PATCH v4 2/4] platform/x86: think-lmi: use correct possible_values delimiters Thomas Weißschuh
2023-03-22 14:22 ` Hans de Goede
2023-03-20 0:32 ` [PATCH v4 3/4] platform/x86: think-lmi: only display possible_values if available Mark Pearson
2023-03-20 0:32 ` [PATCH v4 4/4] platform/x86: think-lmi: Add possible_values for ThinkStation Mark Pearson
2023-03-20 13:56 ` [PATCH v4 1/4] platform/x86: think-lmi: add missing type attribute Hans de Goede
2023-03-20 13:57 ` Hans de Goede
2023-03-20 13:58 ` Mark Pearson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230320003221.561750-2-mpearson-lenovo@squebb.ca \
--to=mpearson-lenovo@squebb.ca \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@weissschuh.net \
--cc=markgross@kernel.org \
--cc=markpearson@lenovo.com \
--cc=pobrn@protonmail.com \
--cc=thomas@t-8ch.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®