From patchwork Mon Nov 13 18:58:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Harshit Mogalapalli X-Patchwork-Id: 164598 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1410300vqg; Mon, 13 Nov 2023 10:59:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IG/Oywvg06dGcF5BxHI5lOfV8s3cyTSJVqhG+hxdP0ndSVqtB/8XReQE96S8rpZkRGt1ut6 X-Received: by 2002:a05:6a00:2e21:b0:68e:46d2:e331 with SMTP id fc33-20020a056a002e2100b0068e46d2e331mr6781715pfb.23.1699901959997; Mon, 13 Nov 2023 10:59:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699901959; cv=none; d=google.com; s=arc-20160816; b=ncuBE2es5bAR/a/oV6r8MZVx4CLwwyG7QmTvUY4LtqU1LvOSRkSzWZEqQSwMYkSDec 0uTdmVNNozfJ0/9ulrjHTsMql4lunu6hprRsv2OforUHAQ3p6kDbD3g+cuvRvnHOOJxz 13SncPm08+4ehu4wEEdtB/8vR1QB8DpYQ/bnMPOjuqJIFMpvy1PPlkF/KUaSZiFx8LJI gtfZd1p8o0OHYL0JCwF8FY3MI18iKnJ6ewvuR67Bl2qB5WtQN2r9D56D2O3N8FrIqIdY FqS0REeZJH4YAp0/uPRK8sn2eopY9FAPqfeESSyI1nAtjbU4xOLz18Amixh3mTnClLw4 SOpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=rms0EBJlQA/WbF9f5fMcthPrbCoO3mTvOoWCy/BgO0I=; fh=YRxemmcaHY6sEJjOQnh/QgYDMEtZ6d1JiMzHL5HIkZw=; b=Jc8jZpSFmUpmkiNIkcK9/N211USJtazXfMKmxkOPJP616ctz05r/BcibU9GXRdK+xP 2CGOEf8jua3AJRJkeOTGxvCxRZOjRmHrfBg1znuKif1gWAOy2tAS4uPQzva/AMMwicXH YEh+2WADDPPL8GSyn5XjTYJSQF5pjAtfpX0z/7ayDcF1W+pYK5uEdJM9hOttHH25ZpIl gWTS2HCrF8Bj1Y+6/hnGah+XMpMO1asQncKGQituKxf8EBAUaxJCJCf2sY2BQVQM7t0C 2WFSEe2z3poaxHFtlCiZisoZDXo1MnDFB6ehONIS3nYzcWf89d0+yWnQDJfwnyR7CW68 xpXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=TYxrabgK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id l125-20020a633e83000000b0058986c07537si6687276pga.220.2023.11.13.10.59.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 10:59:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=TYxrabgK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 37B628077999; Mon, 13 Nov 2023 10:59:18 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231635AbjKMS7N (ORCPT + 30 others); Mon, 13 Nov 2023 13:59:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230086AbjKMS7L (ORCPT ); Mon, 13 Nov 2023 13:59:11 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BD90F5; Mon, 13 Nov 2023 10:59:08 -0800 (PST) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3ADHiQiC005408; Mon, 13 Nov 2023 18:58:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=corp-2023-03-30; bh=rms0EBJlQA/WbF9f5fMcthPrbCoO3mTvOoWCy/BgO0I=; b=TYxrabgK6Y/h1mMRKDPfQSehMhjVL00vArKAMAc5GJLXthTzHt9REI9R46y+dEFlrY8R EYPB43JkD5WFObYn+8BWsqliYjrmj3TCaUUCZhez88fwfGlb5YCZd5UQmM7NJ7KksKVm kqwgJy5mFTrjgqNUbar64yOUYDirBor0Nuco3zwfKc/BsAyIe8AsluwOyB1DVU4NTs63 aaCYKz3EOfnuzZqh2/BP95pQQBS/jTzDiM3mt04s1FVVCbNxN4w8K1GbXl26JO5n5Aqu QD6tA8jfqrappM8pkZxZi9+BuvDVxVrnDtFkOm9nEVe86cJwTgQudjnTkXUO53ZHv6WT jQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ua2n3bgcv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 18:58:56 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 3ADHiZRe015109; Mon, 13 Nov 2023 18:58:56 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3uaxpuuqwg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 18:58:56 +0000 Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3ADIwtmN021868; Mon, 13 Nov 2023 18:58:55 GMT Received: from ca-dev112.us.oracle.com (ca-dev112.us.oracle.com [10.129.136.47]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 3uaxpuuqw1-1; Mon, 13 Nov 2023 18:58:55 +0000 From: Harshit Mogalapalli To: Jorge Lopez , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Mark Gross , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Cc: dan.carpenter@linaro.org, kernel-janitors@vger.kernel.org, error27@gmail.com, vegard.nossum@oracle.com, harshit.m.mogalapalli@oracle.com, darren.kenny@oracle.com Subject: [PATCH v3 1/4] platform/x86: hp-bioscfg: Simplify return check in hp_add_other_attributes() Date: Mon, 13 Nov 2023 10:58:47 -0800 Message-ID: <20231113185852.3579970-1-harshit.m.mogalapalli@oracle.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-13_09,2023-11-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 adultscore=0 phishscore=0 mlxscore=0 bulkscore=0 spamscore=0 suspectscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311130153 X-Proofpoint-GUID: wYpONw9UBO1mjcN28XGgHDMXMLIYaeau X-Proofpoint-ORIG-GUID: wYpONw9UBO1mjcN28XGgHDMXMLIYaeau X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 13 Nov 2023 10:59:18 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782476397472864557 X-GMAIL-MSGID: 1782476397472864557 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 Reviewed-by: Ilpo Järvinen --- 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; err_other_attr_init: mutex_unlock(&bioscfg_drv.mutex); kfree(obj); return ret; }