From patchwork Fri Nov 10 14:29:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harshit Mogalapalli X-Patchwork-Id: 163879 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp1300721vqs; Fri, 10 Nov 2023 10:23:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IFe5KR+RQmKmCm6uMZkTC7wTYezuFXkZ+DlreuuVgRyrMD50PKQ7tvExcUyUnOQrW9zGgta X-Received: by 2002:a05:6e02:20c4:b0:359:439b:f25d with SMTP id 4-20020a056e0220c400b00359439bf25dmr126840ilq.24.1699640603166; Fri, 10 Nov 2023 10:23:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699640603; cv=none; d=google.com; s=arc-20160816; b=H4brSEhhj51rNScIdtLLMWn8I6AvHXse1uTzmYjZfqn7zUFUfSThvtyHuKAct3dNaE 5Y/zVsZ5nROqubtk1lOExOqaMOFLbtsUQWOvvWn1G3itPXcMXB/D5GhTNwhBTdN9qRvy l9seLbfGO80uI0zJhODGA3fJq8MjqnTF/rpwLsMg5JybPm5/4cI/WIPg3vvkzadle20E vpce4nqDnIGSESAHhBibtCDZ8tHpxQzVEs4N0sDRArdE0QNNMKxsip1KvCgvCUAe4r46 V3Qh9LMqilZ1+/Faq+ToT5ZEVFE1vXkOf6FIk+IZkH2Gd7piGxLQoQAITl1r6WCBpvsB msFA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=k8d1cotThVqQ5somJC2AYN30Z0cn4dxTNW2i+PUkPMY=; fh=YRxemmcaHY6sEJjOQnh/QgYDMEtZ6d1JiMzHL5HIkZw=; b=wxxPuqqmVnHnht4ZkLPLJlf6wzPpYnB9BuwXW1SzdK7jmbmYfl3pAKS8roRUnbeTDA YdlV/wGvp3XiLcAt0K+CGkihguhktn1sZ5YiI6pEVhook/iGiuQSheDd0GHV1ikLdrfR 2jm5RL7nyFIe+od85mvjRmpvTk6IlwsKkgfpmCs8tLecxs0ydKwhvOxXH/dZeJZQP2mH RgCJSq2guyvxAQBhJoyDdycnSeuV+Oh1in47ynlSAnIszIgTdRTK5MchuFqg7mcfYg9U k+s40o1oeOji7HZJuEsdyeznzhBM20ZMSDtv7hIpokvGui26NGaN3UFnojPMU8SDVThL ocsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=04R89OBu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id bz35-20020a056a02062300b005bdfd3a26a0si5097503pgb.584.2023.11.10.10.23.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 10:23:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=04R89OBu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id BD0F68142DA1; Fri, 10 Nov 2023 10:22:54 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345685AbjKJSTE (ORCPT + 30 others); Fri, 10 Nov 2023 13:19:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346173AbjKJSQp (ORCPT ); Fri, 10 Nov 2023 13:16:45 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9566538EAE; Fri, 10 Nov 2023 06:29:49 -0800 (PST) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AACNcxm016649; Fri, 10 Nov 2023 14:29:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2023-03-30; bh=k8d1cotThVqQ5somJC2AYN30Z0cn4dxTNW2i+PUkPMY=; b=04R89OBuYZ2Ztmq//bK7FNdqajxicN1P8nV3WkK/iPh9g1v6AQ4PO0kBHB7oZj1sDtCH e6bC8vDHZPNcddpJU3LIKZ5p3SqfiAYkPQN/3adWyfymCCaiaULI6EM6thc3x+EcMFUU eSPs0K1IC3ehzaX7KEH0igGZiN0Pwq++y4zio85x3yEjEvFvUWIixb56DZ8hAbW8Na5h nslby29t9cPArx5OUZDcrNS7ZqF1hPXtD62s8/sqEe1o8VNwzWNSqIzZYOaWyTNhBWS2 dD+9qfp6oVKsNy2x3mtNhD7pdPujX3/p/rXlbw0YvF+TVsOGV049fJRJMVU1fC5lOqoC Zw== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3u7w236d3b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 10 Nov 2023 14:29:39 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 3AACoBM3024992; Fri, 10 Nov 2023 14:29:38 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3u9fr6y1fc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 10 Nov 2023 14:29:38 +0000 Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3AAEQwWL000777; Fri, 10 Nov 2023 14:29:37 GMT Received: from ca-dev112.us.oracle.com (ca-dev112.us.oracle.com [10.129.136.47]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3u9fr6y1bq-2; Fri, 10 Nov 2023 14:29:37 +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 v2 2/4] platform/x86: hp-bioscfg: Simplify return check in hp_add_other_attributes() Date: Fri, 10 Nov 2023 06:29:17 -0800 Message-ID: <20231110142921.3398072-2-harshit.m.mogalapalli@oracle.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231110142921.3398072-1-harshit.m.mogalapalli@oracle.com> References: <20231110142921.3398072-1-harshit.m.mogalapalli@oracle.com> 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-10_11,2023-11-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 adultscore=0 mlxscore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311100120 X-Proofpoint-GUID: wrHYY_2VxULbkL_HhzV5y817nlITz8QX X-Proofpoint-ORIG-GUID: wrHYY_2VxULbkL_HhzV5y817nlITz8QX X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email 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 (lipwig.vger.email [0.0.0.0]); Fri, 10 Nov 2023 10:22:54 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782202344954005724 X-GMAIL-MSGID: 1782202344954005724 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 --- 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; }