diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2021-11-18 12:41:49 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2021-11-22 13:51:15 +0100 |
| commit | 01df1385ec4ec699ad6a63007e7f1081089e83a0 (patch) | |
| tree | 18c8a34f79b52124288134f14a8cbd806242b042 /drivers/platform | |
| parent | 640a5fa50a42b99bfa2a0ec51b4ea9591d9bd055 (diff) | |
platform/x86: think-lmi: Move kobject_init() call into tlmi_create_auth()
All callers of tlmi_create_auth() also call
kobject_init(&pwd_setting->kobj, &tlmi_pwd_setting_ktype) on the returned
tlmi_pwd_setting struct. Move this into tlmi_create_auth().
Tested-by: Mark Pearson <markpearson@lenovo.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20211118114150.271274-1-hdegoede@redhat.com
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/think-lmi.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c index fee9e004161f..6eba69334fa6 100644 --- a/drivers/platform/x86/think-lmi.c +++ b/drivers/platform/x86/think-lmi.c @@ -1057,6 +1057,9 @@ static struct tlmi_pwd_setting *tlmi_create_auth(const char *pwd_type, new_pwd->minlen = tlmi_priv.pwdcfg.core.min_length; new_pwd->maxlen = tlmi_priv.pwdcfg.core.max_length; new_pwd->index = 0; + + kobject_init(&new_pwd->kobj, &tlmi_pwd_setting_ktype); + return new_pwd; } @@ -1146,8 +1149,6 @@ static int tlmi_analyze(void) if (tlmi_priv.pwdcfg.core.password_state & TLMI_PAP_PWD) tlmi_priv.pwd_admin->valid = true; - kobject_init(&tlmi_priv.pwd_admin->kobj, &tlmi_pwd_setting_ktype); - tlmi_priv.pwd_power = tlmi_create_auth("pop", "power-on"); if (!tlmi_priv.pwd_power) { ret = -ENOMEM; @@ -1156,8 +1157,6 @@ static int tlmi_analyze(void) if (tlmi_priv.pwdcfg.core.password_state & TLMI_POP_PWD) tlmi_priv.pwd_power->valid = true; - kobject_init(&tlmi_priv.pwd_power->kobj, &tlmi_pwd_setting_ktype); - if (tlmi_priv.opcode_support) { tlmi_priv.pwd_system = tlmi_create_auth("sys", "system"); if (!tlmi_priv.pwd_system) { @@ -1167,21 +1166,17 @@ static int tlmi_analyze(void) if (tlmi_priv.pwdcfg.core.password_state & TLMI_SYS_PWD) tlmi_priv.pwd_system->valid = true; - kobject_init(&tlmi_priv.pwd_system->kobj, &tlmi_pwd_setting_ktype); - tlmi_priv.pwd_hdd = tlmi_create_auth("hdd", "hdd"); if (!tlmi_priv.pwd_hdd) { ret = -ENOMEM; goto fail_clear_attr; } - kobject_init(&tlmi_priv.pwd_hdd->kobj, &tlmi_pwd_setting_ktype); tlmi_priv.pwd_nvme = tlmi_create_auth("nvm", "nvme"); if (!tlmi_priv.pwd_nvme) { ret = -ENOMEM; goto fail_clear_attr; } - kobject_init(&tlmi_priv.pwd_nvme->kobj, &tlmi_pwd_setting_ktype); if (tlmi_priv.pwdcfg.core.password_state & TLMI_HDD_PWD) { /* Check if PWD is configured and set index to first drive found */ |