| Message ID | 20230317154635.39692-1-mpearson-lenovo@squebb.ca (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | [v3,1/3] platform/x86: think-lmi: add missing type attribute | expand |
[Public] > -----Original Message----- > From: Mark Pearson <mpearson-lenovo@squebb.ca> > Sent: Friday, March 17, 2023 10:47 > To: mpearson-lenovo@squebb.ca > Cc: hdegoede@redhat.com; markgross@kernel.org; > markpearson@lenovo.com; platform-driver-x86@vger.kernel.org > Subject: [PATCH v3 1/3] platform/x86: think-lmi: add missing type attribute > > This driver was missing the mandatory type attribute...oops. > > Add it in along with logic to determine whether the attribute is an > enumeration type or a string by parsing the possible_values attribute. > > Upstream bug https://bugzilla.kernel.org/show_bug.cgi?id=216460' The tag you should use here is "Link". IOW: Link: https://bugzilla.kernel.org/show_bug.cgi?id=216460 > > Signed-off-by: Mark Pearson <mpearson-lenovo@squebb.ca> > --- > Changes in v3: > - Rebased on latest pdx86, review_hans branch > Changes in v2: > - Simplify the code and move type determination into show function > - Don't use Fixes with URL in commit info > > drivers/platform/x86/think-lmi.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think- > lmi.c > index 86b33b74519b..5fa5451c4802 100644 > --- a/drivers/platform/x86/think-lmi.c > +++ b/drivers/platform/x86/think-lmi.c > @@ -947,6 +947,20 @@ static ssize_t possible_values_show(struct kobject > *kobj, struct kobj_attribute > return sysfs_emit(buf, "%s\n", setting->possible_values); > } > > +static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr, > + char *buf) > +{ > + struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj); > + > + if (setting->possible_values) { > + /* Figure out what setting type is as BIOS does not return this > */ > + if (strchr(setting->possible_values, ',')) > + return sysfs_emit(buf, "enumeration\n"); > + } > + /* Anything else is going to be a string */ > + return sysfs_emit(buf, "string\n"); > +} > + > static ssize_t current_value_store(struct kobject *kobj, > struct kobj_attribute *attr, > const char *buf, size_t count) > @@ -1036,10 +1050,13 @@ static struct kobj_attribute attr_possible_values > = __ATTR_RO(possible_values); > > static struct kobj_attribute attr_current_val = > __ATTR_RW_MODE(current_value, 0600); > > +static struct kobj_attribute attr_type = __ATTR_RO(type); > + > static struct attribute *tlmi_attrs[] = { > &attr_displ_name.attr, > &attr_current_val.attr, > &attr_possible_values.attr, > + &attr_type.attr, > NULL > }; > > -- > 2.39.2
diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c index 86b33b74519b..5fa5451c4802 100644 --- a/drivers/platform/x86/think-lmi.c +++ b/drivers/platform/x86/think-lmi.c @@ -947,6 +947,20 @@ static ssize_t possible_values_show(struct kobject *kobj, struct kobj_attribute return sysfs_emit(buf, "%s\n", setting->possible_values); } +static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr, + char *buf) +{ + struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj); + + if (setting->possible_values) { + /* Figure out what setting type is as BIOS does not return this */ + if (strchr(setting->possible_values, ',')) + return sysfs_emit(buf, "enumeration\n"); + } + /* Anything else is going to be a string */ + return sysfs_emit(buf, "string\n"); +} + static ssize_t current_value_store(struct kobject *kobj, struct kobj_attribute *attr, const char *buf, size_t count) @@ -1036,10 +1050,13 @@ static struct kobj_attribute attr_possible_values = __ATTR_RO(possible_values); static struct kobj_attribute attr_current_val = __ATTR_RW_MODE(current_value, 0600); +static struct kobj_attribute attr_type = __ATTR_RO(type); + static struct attribute *tlmi_attrs[] = { &attr_displ_name.attr, &attr_current_val.attr, &attr_possible_values.attr, + &attr_type.attr, NULL };
This driver was missing the mandatory type attribute...oops. Add it in along with logic to determine whether the attribute is an enumeration type or a string by parsing the possible_values attribute. Upstream bug https://bugzilla.kernel.org/show_bug.cgi?id=216460 Signed-off-by: Mark Pearson <mpearson-lenovo@squebb.ca> --- Changes in v3: - Rebased on latest pdx86, review_hans branch Changes in v2: - Simplify the code and move type determination into show function - Don't use Fixes with URL in commit info drivers/platform/x86/think-lmi.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)