platform-driver-x86.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Pearson <mpearson-lenovo@squebb.ca>
To: mpearson-lenovo@squebb.ca
Cc: hdegoede@redhat.com, markgross@kernel.org,
	markpearson@lenovo.com, platform-driver-x86@vger.kernel.org
Subject: [PATCH v3 3/3] platform/x86: think-lmi: use correct possible_values delimters
Date: Fri, 17 Mar 2023 11:46:35 -0400	[thread overview]
Message-ID: <20230317154635.39692-3-mpearson-lenovo@squebb.ca> (raw)
In-Reply-To: <20230317154635.39692-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

Thanks to Thomas W for pointing this out.

Signed-off-by: Mark Pearson <mpearson-lenovo@squebb.ca>
---
 Changes in V3: New patch added to the series. No V1 & V2.

 drivers/platform/x86/think-lmi.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
index d89a1c9bdbf1..204f1060a533 100644
--- a/drivers/platform/x86/think-lmi.c
+++ b/drivers/platform/x86/think-lmi.c
@@ -1040,7 +1040,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 */
@@ -1471,6 +1471,17 @@ static int tlmi_analyze(void)
 				}
 			}
 		}
+		/*
+		 * firmware-attributes requires that possible_values are separated by ';' but
+		 * Lenovo FW uses ','. Replace appropriately.
+		 */
+		if (setting->possible_values) {
+			char *tmp = setting->possible_values;
+
+			while ((tmp = strchr(tmp, ',')) != NULL)
+				*tmp++ = ';';
+		}
+
 		kobject_init(&setting->kobj, &tlmi_attr_setting_ktype);
 		tlmi_priv.setting[i] = setting;
 		kfree(item);
-- 
2.39.2


  parent reply	other threads:[~2023-03-17 15:47 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-17 15:46 [PATCH v3 1/3] platform/x86: think-lmi: add missing type attribute Mark Pearson
2023-03-17 15:46 ` [PATCH v3 2/3] platform/x86: think-lmi: Add possible_values for ThinkStation Mark Pearson
2023-03-18 16:35   ` Thomas Weißschuh
2023-03-18 17:53     ` Mark Pearson
2023-03-18 23:52       ` Thomas Weißschuh
2023-03-19  0:08         ` Mark Pearson
2023-03-19  9:34           ` Hans de Goede
2023-03-18 17:59     ` Mark Pearson
2023-03-19  0:01       ` Thomas Weißschuh
2023-03-19  0:04         ` Mark Pearson
2023-03-17 15:46 ` Mark Pearson [this message]
2023-03-18 14:37   ` [PATCH v3 3/3] platform/x86: think-lmi: use correct possible_values delimters Barnabás Pőcze
2023-03-18 17:55     ` Mark Pearson
2023-03-18 16:39   ` Thomas Weißschuh
2023-03-18 18:06     ` Mark Pearson
2023-03-19  0:11       ` Thomas Weißschuh
2023-03-19  0:18         ` Mark Pearson
2023-03-20  0:52 ` [PATCH v3 1/3] platform/x86: think-lmi: add missing type attribute Limonciello, Mario

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=20230317154635.39692-3-mpearson-lenovo@squebb.ca \
    --to=mpearson-lenovo@squebb.ca \
    --cc=hdegoede@redhat.com \
    --cc=markgross@kernel.org \
    --cc=markpearson@lenovo.com \
    --cc=platform-driver-x86@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).