| Message ID | 20211118114150.271274-2-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [1/2] platform/x86: think-lmi: Move kobject_init() call into tlmi_create_auth() | expand |
Thanks Hans, On 2021-11-18 06:41, Hans de Goede wrote: > Creating the tlmi_pwd_setting structs can only fail with -ENOMEM, set > ret to this once and simplify the error handling a bit. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/platform/x86/think-lmi.c | 26 +++++++++++--------------- > 1 file changed, 11 insertions(+), 15 deletions(-) > > diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c > index 6eba69334fa6..27ab8e4e5b83 100644 > --- a/drivers/platform/x86/think-lmi.c > +++ b/drivers/platform/x86/think-lmi.c > @@ -1141,42 +1141,38 @@ static int tlmi_analyze(void) > if (ret) > goto fail_clear_attr; > > + /* All failures below boil down to kmalloc failures */ > + ret = -ENOMEM; > + > tlmi_priv.pwd_admin = tlmi_create_auth("pap", "bios-admin"); > - if (!tlmi_priv.pwd_admin) { > - ret = -ENOMEM; > + if (!tlmi_priv.pwd_admin) > goto fail_clear_attr; > - } > + > if (tlmi_priv.pwdcfg.core.password_state & TLMI_PAP_PWD) > tlmi_priv.pwd_admin->valid = true; > > tlmi_priv.pwd_power = tlmi_create_auth("pop", "power-on"); > - if (!tlmi_priv.pwd_power) { > - ret = -ENOMEM; > + if (!tlmi_priv.pwd_power) > goto fail_clear_attr; > - } > + > if (tlmi_priv.pwdcfg.core.password_state & TLMI_POP_PWD) > tlmi_priv.pwd_power->valid = true; > > if (tlmi_priv.opcode_support) { > tlmi_priv.pwd_system = tlmi_create_auth("sys", "system"); > - if (!tlmi_priv.pwd_system) { > - ret = -ENOMEM; > + if (!tlmi_priv.pwd_system) > goto fail_clear_attr; > - } > + > if (tlmi_priv.pwdcfg.core.password_state & TLMI_SYS_PWD) > tlmi_priv.pwd_system->valid = true; > > tlmi_priv.pwd_hdd = tlmi_create_auth("hdd", "hdd"); > - if (!tlmi_priv.pwd_hdd) { > - ret = -ENOMEM; > + if (!tlmi_priv.pwd_hdd) > goto fail_clear_attr; > - } > > tlmi_priv.pwd_nvme = tlmi_create_auth("nvm", "nvme"); > - if (!tlmi_priv.pwd_nvme) { > - ret = -ENOMEM; > + if (!tlmi_priv.pwd_nvme) > goto fail_clear_attr; > - } > > if (tlmi_priv.pwdcfg.core.password_state & TLMI_HDD_PWD) { > /* Check if PWD is configured and set index to first drive found */ > Looks good, and works well. Verified with modifying NVMe and Admin password on M90n Tested-by: Mark Pearson <markpearson@lenovo.com>
Hi, On 11/18/21 16:46, Mark Pearson wrote: > Thanks Hans, > > On 2021-11-18 06:41, Hans de Goede wrote: >> Creating the tlmi_pwd_setting structs can only fail with -ENOMEM, set >> ret to this once and simplify the error handling a bit. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> drivers/platform/x86/think-lmi.c | 26 +++++++++++--------------- >> 1 file changed, 11 insertions(+), 15 deletions(-) >> >> diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c >> index 6eba69334fa6..27ab8e4e5b83 100644 >> --- a/drivers/platform/x86/think-lmi.c >> +++ b/drivers/platform/x86/think-lmi.c >> @@ -1141,42 +1141,38 @@ static int tlmi_analyze(void) >> if (ret) >> goto fail_clear_attr; >> >> + /* All failures below boil down to kmalloc failures */ >> + ret = -ENOMEM; >> + >> tlmi_priv.pwd_admin = tlmi_create_auth("pap", "bios-admin"); >> - if (!tlmi_priv.pwd_admin) { >> - ret = -ENOMEM; >> + if (!tlmi_priv.pwd_admin) >> goto fail_clear_attr; >> - } >> + >> if (tlmi_priv.pwdcfg.core.password_state & TLMI_PAP_PWD) >> tlmi_priv.pwd_admin->valid = true; >> >> tlmi_priv.pwd_power = tlmi_create_auth("pop", "power-on"); >> - if (!tlmi_priv.pwd_power) { >> - ret = -ENOMEM; >> + if (!tlmi_priv.pwd_power) >> goto fail_clear_attr; >> - } >> + >> if (tlmi_priv.pwdcfg.core.password_state & TLMI_POP_PWD) >> tlmi_priv.pwd_power->valid = true; >> >> if (tlmi_priv.opcode_support) { >> tlmi_priv.pwd_system = tlmi_create_auth("sys", "system"); >> - if (!tlmi_priv.pwd_system) { >> - ret = -ENOMEM; >> + if (!tlmi_priv.pwd_system) >> goto fail_clear_attr; >> - } >> + >> if (tlmi_priv.pwdcfg.core.password_state & TLMI_SYS_PWD) >> tlmi_priv.pwd_system->valid = true; >> >> tlmi_priv.pwd_hdd = tlmi_create_auth("hdd", "hdd"); >> - if (!tlmi_priv.pwd_hdd) { >> - ret = -ENOMEM; >> + if (!tlmi_priv.pwd_hdd) >> goto fail_clear_attr; >> - } >> >> tlmi_priv.pwd_nvme = tlmi_create_auth("nvm", "nvme"); >> - if (!tlmi_priv.pwd_nvme) { >> - ret = -ENOMEM; >> + if (!tlmi_priv.pwd_nvme) >> goto fail_clear_attr; >> - } >> >> if (tlmi_priv.pwdcfg.core.password_state & TLMI_HDD_PWD) { >> /* Check if PWD is configured and set index to first drive found */ >> > Looks good, and works well. Verified with modifying NVMe and Admin > password on M90n > > Tested-by: Mark Pearson <markpearson@lenovo.com> Thank you, I've pushed both patches to my for-next branch now, with your Tested-by tag added. Regards, Hans
diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c index 6eba69334fa6..27ab8e4e5b83 100644 --- a/drivers/platform/x86/think-lmi.c +++ b/drivers/platform/x86/think-lmi.c @@ -1141,42 +1141,38 @@ static int tlmi_analyze(void) if (ret) goto fail_clear_attr; + /* All failures below boil down to kmalloc failures */ + ret = -ENOMEM; + tlmi_priv.pwd_admin = tlmi_create_auth("pap", "bios-admin"); - if (!tlmi_priv.pwd_admin) { - ret = -ENOMEM; + if (!tlmi_priv.pwd_admin) goto fail_clear_attr; - } + if (tlmi_priv.pwdcfg.core.password_state & TLMI_PAP_PWD) tlmi_priv.pwd_admin->valid = true; tlmi_priv.pwd_power = tlmi_create_auth("pop", "power-on"); - if (!tlmi_priv.pwd_power) { - ret = -ENOMEM; + if (!tlmi_priv.pwd_power) goto fail_clear_attr; - } + if (tlmi_priv.pwdcfg.core.password_state & TLMI_POP_PWD) tlmi_priv.pwd_power->valid = true; if (tlmi_priv.opcode_support) { tlmi_priv.pwd_system = tlmi_create_auth("sys", "system"); - if (!tlmi_priv.pwd_system) { - ret = -ENOMEM; + if (!tlmi_priv.pwd_system) goto fail_clear_attr; - } + if (tlmi_priv.pwdcfg.core.password_state & TLMI_SYS_PWD) tlmi_priv.pwd_system->valid = true; tlmi_priv.pwd_hdd = tlmi_create_auth("hdd", "hdd"); - if (!tlmi_priv.pwd_hdd) { - ret = -ENOMEM; + if (!tlmi_priv.pwd_hdd) goto fail_clear_attr; - } tlmi_priv.pwd_nvme = tlmi_create_auth("nvm", "nvme"); - if (!tlmi_priv.pwd_nvme) { - ret = -ENOMEM; + if (!tlmi_priv.pwd_nvme) goto fail_clear_attr; - } if (tlmi_priv.pwdcfg.core.password_state & TLMI_HDD_PWD) { /* Check if PWD is configured and set index to first drive found */
Creating the tlmi_pwd_setting structs can only fail with -ENOMEM, set ret to this once and simplify the error handling a bit. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/platform/x86/think-lmi.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-)