On Mon, 13 Nov 2023, Harshit Mogalapalli wrote:
> All cases in switch-case have a same goto on error, move the return
> check out of the switch. This is a cleanup.
>
> Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@xxxxxxxxxx>
> ---
> drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
> index 5798b49ddaba..10676e1abc28 100644
> --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
> +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
> @@ -575,81 +575,79 @@ static void release_attributes_data(void)
> /**
> * hp_add_other_attributes() - Initialize HP custom attributes not
> * reported by BIOS and required to support Secure Platform and Sure
> * Start.
> *
> * @attr_type: Custom HP attribute not reported by BIOS
> *
> * Initialize all 2 types of attributes: Platform and Sure Start
> * object. Populates each attribute types respective properties
> * under sysfs files.
> *
> * Returns zero(0) if successful. Otherwise, a negative value.
> */
> static int hp_add_other_attributes(int attr_type)
> {
> struct kobject *attr_name_kobj;
> union acpi_object *obj = NULL;
> int ret;
> char *attr_name;
>
> mutex_lock(&bioscfg_drv.mutex);
>
> attr_name_kobj = kzalloc(sizeof(*attr_name_kobj), GFP_KERNEL);
> if (!attr_name_kobj) {
> ret = -ENOMEM;
> goto err_other_attr_init;
> }
>
> /* Check if attribute type is supported */
> switch (attr_type) {
> case HPWMI_SECURE_PLATFORM_TYPE:
> attr_name_kobj->kset = bioscfg_drv.authentication_dir_kset;
> attr_name = SPM_STR;
> break;
>
> case HPWMI_SURE_START_TYPE:
> attr_name_kobj->kset = bioscfg_drv.main_dir_kset;
> attr_name = SURE_START_STR;
> break;
>
> default:
> pr_err("Error: Unknown attr_type: %d\n", attr_type);
> ret = -EINVAL;
> goto err_other_attr_init;
> }
>
> ret = kobject_init_and_add(attr_name_kobj, &attr_name_ktype,
> NULL, "%s", attr_name);
> if (ret) {
> pr_err("Error encountered [%d]\n", ret);
> kobject_put(attr_name_kobj);
> goto err_other_attr_init;
> }
>
> /* Populate attribute data */
> switch (attr_type) {
> case HPWMI_SECURE_PLATFORM_TYPE:
> ret = hp_populate_secure_platform_data(attr_name_kobj);
> - if (ret)
> - goto err_other_attr_init;
> break;
>
> case HPWMI_SURE_START_TYPE:
> ret = hp_populate_sure_start_data(attr_name_kobj);
> - if (ret)
> - goto err_other_attr_init;
> break;
>
> default:
> ret = -EINVAL;
> - goto err_other_attr_init;
> }
>
> + if (ret)
> + goto err_other_attr_init;
> +
> mutex_unlock(&bioscfg_drv.mutex);
> return 0;
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
--
i.
