From nobody Thu Dec 18 00:47:22 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD237C004C0 for ; Sat, 21 Oct 2023 08:38:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230042AbjJUIiB (ORCPT ); Sat, 21 Oct 2023 04:38:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229472AbjJUIh7 (ORCPT ); Sat, 21 Oct 2023 04:37:59 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27BE4D41 for ; Sat, 21 Oct 2023 01:37:56 -0700 (PDT) Received: from dggpeml500002.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4SCF9Y3D4HzVlZj; Sat, 21 Oct 2023 16:34:09 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggpeml500002.china.huawei.com (7.185.36.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Sat, 21 Oct 2023 16:37:54 +0800 From: Junhao He To: , CC: , , , , , , , Subject: [PATCH v2 4/4] coresight: ultrasoc-smb: Use guards to cleanup Date: Sat, 21 Oct 2023 16:38:22 +0800 Message-ID: <20231021083822.18239-5-hejunhao3@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20231021083822.18239-1-hejunhao3@huawei.com> References: <20231021083822.18239-1-hejunhao3@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500002.china.huawei.com (7.185.36.158) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use guards to reduce gotos and simplify control flow. Signed-off-by: Junhao He --- drivers/hwtracing/coresight/ultrasoc-smb.c | 70 +++++++--------------- 1 file changed, 22 insertions(+), 48 deletions(-) diff --git a/drivers/hwtracing/coresight/ultrasoc-smb.c b/drivers/hwtracing= /coresight/ultrasoc-smb.c index 2ee6bf5b725e..5140782b1b5d 100644 --- a/drivers/hwtracing/coresight/ultrasoc-smb.c +++ b/drivers/hwtracing/coresight/ultrasoc-smb.c @@ -97,27 +97,19 @@ static int smb_open(struct inode *inode, struct file *f= ile) { struct smb_drv_data *drvdata =3D container_of(file->private_data, struct smb_drv_data, miscdev); - int ret =3D 0; =20 - spin_lock(&drvdata->spinlock); + guard(spinlock)(&drvdata->spinlock); =20 - if (drvdata->reading) { - ret =3D -EBUSY; - goto out; - } + if (drvdata->reading) + return -EBUSY; =20 - if (atomic_read(&drvdata->csdev->refcnt)) { - ret =3D -EBUSY; - goto out; - } + if (atomic_read(&drvdata->csdev->refcnt)) + return -EBUSY; =20 smb_update_data_size(drvdata); - drvdata->reading =3D true; -out: - spin_unlock(&drvdata->spinlock); =20 - return ret; + return 0; } =20 static ssize_t smb_read(struct file *file, char __user *data, size_t len, @@ -160,9 +152,8 @@ static int smb_release(struct inode *inode, struct file= *file) struct smb_drv_data *drvdata =3D container_of(file->private_data, struct smb_drv_data, miscdev); =20 - spin_lock(&drvdata->spinlock); + guard(spinlock)(&drvdata->spinlock); drvdata->reading =3D false; - spin_unlock(&drvdata->spinlock); =20 return 0; } @@ -255,19 +246,15 @@ static int smb_enable(struct coresight_device *csdev,= enum cs_mode mode, struct smb_drv_data *drvdata =3D dev_get_drvdata(csdev->dev.parent); int ret =3D 0; =20 - spin_lock(&drvdata->spinlock); + guard(spinlock)(&drvdata->spinlock); =20 /* Do nothing, the trace data is reading by other interface now */ - if (drvdata->reading) { - ret =3D -EBUSY; - goto out; - } + if (drvdata->reading) + return -EBUSY; =20 /* Do nothing, the SMB is already enabled as other mode */ - if (drvdata->mode !=3D CS_MODE_DISABLED && drvdata->mode !=3D mode) { - ret =3D -EBUSY; - goto out; - } + if (drvdata->mode !=3D CS_MODE_DISABLED && drvdata->mode !=3D mode) + return -EBUSY; =20 switch (mode) { case CS_MODE_SYSFS: @@ -281,13 +268,10 @@ static int smb_enable(struct coresight_device *csdev,= enum cs_mode mode, } =20 if (ret) - goto out; + return ret; =20 atomic_inc(&csdev->refcnt); - dev_dbg(&csdev->dev, "Ultrasoc SMB enabled\n"); -out: - spin_unlock(&drvdata->spinlock); =20 return ret; } @@ -295,19 +279,14 @@ static int smb_enable(struct coresight_device *csdev,= enum cs_mode mode, static int smb_disable(struct coresight_device *csdev) { struct smb_drv_data *drvdata =3D dev_get_drvdata(csdev->dev.parent); - int ret =3D 0; =20 - spin_lock(&drvdata->spinlock); + guard(spinlock)(&drvdata->spinlock); =20 - if (drvdata->reading) { - ret =3D -EBUSY; - goto out; - } + if (drvdata->reading) + return -EBUSY; =20 - if (atomic_dec_return(&csdev->refcnt)) { - ret =3D -EBUSY; - goto out; - } + if (atomic_dec_return(&csdev->refcnt)) + return -EBUSY; =20 /* Complain if we (somehow) got out of sync */ WARN_ON_ONCE(drvdata->mode =3D=3D CS_MODE_DISABLED); @@ -317,12 +296,9 @@ static int smb_disable(struct coresight_device *csdev) /* Dissociate from the target process. */ drvdata->pid =3D -1; drvdata->mode =3D CS_MODE_DISABLED; - dev_dbg(&csdev->dev, "Ultrasoc SMB disabled\n"); -out: - spin_unlock(&drvdata->spinlock); =20 - return ret; + return 0; } =20 static void *smb_alloc_buffer(struct coresight_device *csdev, @@ -395,17 +371,17 @@ static unsigned long smb_update_buffer(struct coresig= ht_device *csdev, struct smb_drv_data *drvdata =3D dev_get_drvdata(csdev->dev.parent); struct smb_data_buffer *sdb =3D &drvdata->sdb; struct cs_buffers *buf =3D sink_config; - unsigned long data_size =3D 0; + unsigned long data_size; bool lost =3D false; =20 if (!buf) return 0; =20 - spin_lock(&drvdata->spinlock); + guard(spinlock)(&drvdata->spinlock); =20 /* Don't do anything if another tracer is using this sink. */ if (atomic_read(&csdev->refcnt) !=3D 1) - goto out; + return 0; =20 smb_disable_hw(drvdata); smb_update_data_size(drvdata); @@ -424,8 +400,6 @@ static unsigned long smb_update_buffer(struct coresight= _device *csdev, smb_sync_perf_buffer(drvdata, buf, handle->head); if (!buf->snapshot && lost) perf_aux_output_flag(handle, PERF_AUX_FLAG_TRUNCATED); -out: - spin_unlock(&drvdata->spinlock); =20 return data_size; } --=20 2.33.0