[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20231110142921.3398072-2-harshit.m.mogalapalli@oracle.com>
Date: Fri, 10 Nov 2023 06:29:17 -0800
From: Harshit Mogalapalli <harshit.m.mogalapalli@...cle.com>
To: Jorge Lopez <jorge.lopez2@...com>,
Hans de Goede <hdegoede@...hat.com>,
Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
Mark Gross <markgross@...nel.org>,
Thomas Weißschuh <linux@...ssschuh.net>,
platform-driver-x86@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: dan.carpenter@...aro.org, kernel-janitors@...r.kernel.org,
error27@...il.com, vegard.nossum@...cle.com,
harshit.m.mogalapalli@...cle.com, darren.kenny@...cle.com
Subject: [PATCH v2 2/4] platform/x86: hp-bioscfg: Simplify return check in hp_add_other_attributes()
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@...cle.com>
---
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 0b563582d90d..3b735b071a01 100644
--- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
+++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
@@ -575,79 +575,77 @@ 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;
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;
err_other_attr_init:
mutex_unlock(&bioscfg_drv.mutex);
return ret;
}
--
2.39.3
Powered by blists - more mailing lists