Merge tag 'platform-drivers-x86-v6.4-1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / drivers / platform / x86 / think-lmi.c

diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c
index 78dc82bda4ddeac371580b48aacbcc5a3ad6e5be..1138f770149d9274bed6ba6f33b480104f1b0f1d 100644 (file)
--- a/drivers/platform/x86/think-lmi.c
+++ b/drivers/platform/x86/think-lmi.c
@@ -862,19 +862,18 @@ static umode_t auth_attr_is_visible(struct kobject *kobj,
        struct tlmi_pwd_setting *setting = to_tlmi_pwd_setting(kobj);
 
        /* We only want to display level and index settings on HDD/NVMe */
-       if ((attr == (struct attribute *)&auth_index) ||
-                       (attr == (struct attribute *)&auth_level)) {
+       if (attr == &auth_index.attr || attr == &auth_level.attr) {
                if ((setting == tlmi_priv.pwd_hdd) || (setting == tlmi_priv.pwd_nvme))
                        return attr->mode;
                return 0;
        }
 
        /* We only display certificates on Admin account, if supported */
-       if ((attr == (struct attribute *)&auth_certificate) ||
-                       (attr == (struct attribute *)&auth_signature) ||
-                       (attr == (struct attribute *)&auth_save_signature) ||
-                       (attr == (struct attribute *)&auth_cert_thumb) ||
-                       (attr == (struct attribute *)&auth_cert_to_password)) {
+       if (attr == &auth_certificate.attr ||
+           attr == &auth_signature.attr ||
+           attr == &auth_save_signature.attr ||
+           attr == &auth_cert_thumb.attr ||
+           attr == &auth_cert_to_password.attr) {
                if ((setting == tlmi_priv.pwd_admin) && tlmi_priv.certificate_support)
                        return attr->mode;
                return 0;
@@ -1079,33 +1078,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);
@@ -1123,12 +1095,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,
@@ -1385,7 +1357,6 @@ static struct tlmi_pwd_setting *tlmi_create_auth(const char *pwd_type,
 
 static int tlmi_analyze(void)
 {
-       acpi_status status;
        int i, ret;
 
        if (wmi_has_guid(LENOVO_SET_BIOS_SETTINGS_GUID) &&
@@ -1422,8 +1393,8 @@ static int tlmi_analyze(void)
                char *p;
 
                tlmi_priv.setting[i] = NULL;
-               status = tlmi_setting(i, &item, LENOVO_BIOS_SETTING_GUID);
-               if (ACPI_FAILURE(status))
+               ret = tlmi_setting(i, &item, LENOVO_BIOS_SETTING_GUID);
+               if (ret)
                        break;
                if (!item)
                        break;