| Message ID | 20230314-think-lmi-sysfs_ops-v1-1-9d4f1cf9caec@weissschuh.net (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | platform/x86: think-lmi: Remove custom kobject sysfs_ops | expand |
Hi, On 3/14/23 01:07, Thomas Weißschuh wrote: > think-lmi defines its own sysfs_ops that are identical to the standard > kobj_sysfs_ops. Use the standard definitions. > > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Thank you for your patch, I've applied this patch to my review-hans branch: https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while. Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window. Regards, Hans > --- > > This has only been compile-tested. > --- > drivers/platform/x86/think-lmi.c | 31 ++----------------------------- > 1 file changed, 2 insertions(+), 29 deletions(-) > > diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c > index 86b33b74519b..2b5ae68ffce8 100644 > --- a/drivers/platform/x86/think-lmi.c > +++ b/drivers/platform/x86/think-lmi.c > @@ -1047,33 +1047,6 @@ static const struct attribute_group tlmi_attr_group = { > .attrs = tlmi_attrs, > }; > > -static ssize_t tlmi_attr_show(struct kobject *kobj, struct attribute *attr, > - char *buf) > -{ > - struct kobj_attribute *kattr; > - > - kattr = container_of(attr, struct kobj_attribute, attr); > - if (kattr->show) > - return kattr->show(kobj, kattr, buf); > - return -EIO; > -} > - > -static ssize_t tlmi_attr_store(struct kobject *kobj, struct attribute *attr, > - const char *buf, size_t count) > -{ > - struct kobj_attribute *kattr; > - > - kattr = container_of(attr, struct kobj_attribute, attr); > - if (kattr->store) > - return kattr->store(kobj, kattr, buf, count); > - return -EIO; > -} > - > -static const struct sysfs_ops tlmi_kobj_sysfs_ops = { > - .show = tlmi_attr_show, > - .store = tlmi_attr_store, > -}; > - > static void tlmi_attr_setting_release(struct kobject *kobj) > { > struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj); > @@ -1091,12 +1064,12 @@ static void tlmi_pwd_setting_release(struct kobject *kobj) > > static const struct kobj_type tlmi_attr_setting_ktype = { > .release = &tlmi_attr_setting_release, > - .sysfs_ops = &tlmi_kobj_sysfs_ops, > + .sysfs_ops = &kobj_sysfs_ops, > }; > > static const struct kobj_type tlmi_pwd_setting_ktype = { > .release = &tlmi_pwd_setting_release, > - .sysfs_ops = &tlmi_kobj_sysfs_ops, > + .sysfs_ops = &kobj_sysfs_ops, > }; > > static ssize_t pending_reboot_show(struct kobject *kobj, struct kobj_attribute *attr, > > --- > base-commit: eeac8ede17557680855031c6f305ece2378af326 > change-id: 20230314-think-lmi-sysfs_ops-e849a18299bb > > Best regards,
Thanks Thomas, Tested on a couple of my platforms - all looked good. Tested-by: mpearson-lenovo@squebb.ca Mark On Thu, Mar 16, 2023, at 10:44 AM, Hans de Goede wrote: > Hi, > > On 3/14/23 01:07, Thomas Weißschuh wrote: >> think-lmi defines its own sysfs_ops that are identical to the standard >> kobj_sysfs_ops. Use the standard definitions. >> >> Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> > > Thank you for your patch, I've applied this patch to my review-hans > branch: > https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans > > Note it will show up in my review-hans branch once I've pushed my > local branch there, which might take a while. > > Once I've run some tests on this branch the patches there will be > added to the platform-drivers-x86/for-next branch and eventually > will be included in the pdx86 pull-request to Linus for the next > merge-window. > > Regards, > > Hans > > >> --- >> >> This has only been compile-tested. >> --- >> drivers/platform/x86/think-lmi.c | 31 ++----------------------------- >> 1 file changed, 2 insertions(+), 29 deletions(-) >> >> diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c >> index 86b33b74519b..2b5ae68ffce8 100644 >> --- a/drivers/platform/x86/think-lmi.c >> +++ b/drivers/platform/x86/think-lmi.c >> @@ -1047,33 +1047,6 @@ static const struct attribute_group tlmi_attr_group = { >> .attrs = tlmi_attrs, >> }; >> >> -static ssize_t tlmi_attr_show(struct kobject *kobj, struct attribute *attr, >> - char *buf) >> -{ >> - struct kobj_attribute *kattr; >> - >> - kattr = container_of(attr, struct kobj_attribute, attr); >> - if (kattr->show) >> - return kattr->show(kobj, kattr, buf); >> - return -EIO; >> -} >> - >> -static ssize_t tlmi_attr_store(struct kobject *kobj, struct attribute *attr, >> - const char *buf, size_t count) >> -{ >> - struct kobj_attribute *kattr; >> - >> - kattr = container_of(attr, struct kobj_attribute, attr); >> - if (kattr->store) >> - return kattr->store(kobj, kattr, buf, count); >> - return -EIO; >> -} >> - >> -static const struct sysfs_ops tlmi_kobj_sysfs_ops = { >> - .show = tlmi_attr_show, >> - .store = tlmi_attr_store, >> -}; >> - >> static void tlmi_attr_setting_release(struct kobject *kobj) >> { >> struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj); >> @@ -1091,12 +1064,12 @@ static void tlmi_pwd_setting_release(struct kobject *kobj) >> >> static const struct kobj_type tlmi_attr_setting_ktype = { >> .release = &tlmi_attr_setting_release, >> - .sysfs_ops = &tlmi_kobj_sysfs_ops, >> + .sysfs_ops = &kobj_sysfs_ops, >> }; >> >> static const struct kobj_type tlmi_pwd_setting_ktype = { >> .release = &tlmi_pwd_setting_release, >> - .sysfs_ops = &tlmi_kobj_sysfs_ops, >> + .sysfs_ops = &kobj_sysfs_ops, >> }; >> >> static ssize_t pending_reboot_show(struct kobject *kobj, struct kobj_attribute *attr, >> >> --- >> base-commit: eeac8ede17557680855031c6f305ece2378af326 >> change-id: 20230314-think-lmi-sysfs_ops-e849a18299bb >> >> Best regards,
diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c index 86b33b74519b..2b5ae68ffce8 100644 --- a/drivers/platform/x86/think-lmi.c +++ b/drivers/platform/x86/think-lmi.c @@ -1047,33 +1047,6 @@ static const struct attribute_group tlmi_attr_group = { .attrs = tlmi_attrs, }; -static ssize_t tlmi_attr_show(struct kobject *kobj, struct attribute *attr, - char *buf) -{ - struct kobj_attribute *kattr; - - kattr = container_of(attr, struct kobj_attribute, attr); - if (kattr->show) - return kattr->show(kobj, kattr, buf); - return -EIO; -} - -static ssize_t tlmi_attr_store(struct kobject *kobj, struct attribute *attr, - const char *buf, size_t count) -{ - struct kobj_attribute *kattr; - - kattr = container_of(attr, struct kobj_attribute, attr); - if (kattr->store) - return kattr->store(kobj, kattr, buf, count); - return -EIO; -} - -static const struct sysfs_ops tlmi_kobj_sysfs_ops = { - .show = tlmi_attr_show, - .store = tlmi_attr_store, -}; - static void tlmi_attr_setting_release(struct kobject *kobj) { struct tlmi_attr_setting *setting = to_tlmi_attr_setting(kobj); @@ -1091,12 +1064,12 @@ static void tlmi_pwd_setting_release(struct kobject *kobj) static const struct kobj_type tlmi_attr_setting_ktype = { .release = &tlmi_attr_setting_release, - .sysfs_ops = &tlmi_kobj_sysfs_ops, + .sysfs_ops = &kobj_sysfs_ops, }; static const struct kobj_type tlmi_pwd_setting_ktype = { .release = &tlmi_pwd_setting_release, - .sysfs_ops = &tlmi_kobj_sysfs_ops, + .sysfs_ops = &kobj_sysfs_ops, }; static ssize_t pending_reboot_show(struct kobject *kobj, struct kobj_attribute *attr,
think-lmi defines its own sysfs_ops that are identical to the standard kobj_sysfs_ops. Use the standard definitions. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> --- This has only been compile-tested. --- drivers/platform/x86/think-lmi.c | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) --- base-commit: eeac8ede17557680855031c6f305ece2378af326 change-id: 20230314-think-lmi-sysfs_ops-e849a18299bb Best regards,