From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6F488356A25 for ; Mon, 2 Feb 2026 09:34:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770024880; cv=none; b=TdMtMLuYBBRG4M471qombzclWn4Fqc5+ZEpIztPA0MATfaTlLd22x0hG57LZQ/nekYVU+0NQCdQok/rRMckWZeqcf/X9pVamylxGx2x/gWlQijfhZ9XDYrlrIGAwqUyYVNwrigDvR2YPZOIm6+Y8GDilido4t7O1KHU2DCRCGCw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770024880; c=relaxed/simple; bh=dJI+qk+Uln3LYcRNyZrbDitW2HiXNUKEvUo4DQ3sYEc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NrnSzbZRZagXQfVOytqkydOKBkN30R+axNVOPWFnFcHM+FoxTL1kuQFjxswWhDMHVhLkEJHBqbatP/C+1lmc1HG//8JrBom7rGlXnsm8kb2ovRCiOAC7GBCTGagc/YX/+Cz22bM37h1mjec/o7qUq3mbZR39nnQPSvxlb1FFnvI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7A059339; Mon, 2 Feb 2026 01:34:32 -0800 (PST) Received: from e132581.arm.com (e132581.arm.com [10.1.196.87]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2B0103F740; Mon, 2 Feb 2026 01:34:37 -0800 (PST) From: Leo Yan Date: Mon, 02 Feb 2026 09:34:03 +0000 Subject: [PATCH v3 7/8] coresight: Do not mix success path with failure handling Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260202-arm_coresight_refactor_dev_register-v3-7-03292470c48c@arm.com> References: <20260202-arm_coresight_refactor_dev_register-v3-0-03292470c48c@arm.com> In-Reply-To: <20260202-arm_coresight_refactor_dev_register-v3-0-03292470c48c@arm.com> To: Suzuki K Poulose , Mike Leach , James Clark , Alexander Shishkin , Greg Kroah-Hartman , Mathieu Poirier , Mao Jinlong Cc: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Leo Yan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1770024862; l=1351; i=leo.yan@arm.com; s=20250604; h=from:subject:message-id; bh=dJI+qk+Uln3LYcRNyZrbDitW2HiXNUKEvUo4DQ3sYEc=; b=wLTzekxTbH4WSbwNo62TlDNpTd8BIwxN8tnb/32jt1XUcGNRgCPtssyj9oGmr90Szx3vhgf5n bbIXetZxt63CEXk7drYeAZUrsx2kRWNTGN2J/TrEMsCCvk/ZJRWfe1+ X-Developer-Key: i=leo.yan@arm.com; a=ed25519; pk=k4BaDbvkCXzBFA7Nw184KHGP5thju8lKqJYIrOWxDhI= Separate the failure handling path from the successful case. Use the 'out_unlock' label only for failure handling. Signed-off-by: Leo Yan --- drivers/hwtracing/coresight/coresight-core.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c index c694b4bea3d724464e97a4932ead584d59d8a69a..955af43010446803030973c72f07315492b2fcf3 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -1398,17 +1398,22 @@ struct coresight_device *coresight_register(struct coresight_desc *desc) registered = true; ret = coresight_create_conns_sysfs_group(csdev); - if (!ret) - ret = coresight_fixup_orphan_conns(csdev); + if (ret) + goto out_unlock; + + ret = coresight_fixup_orphan_conns(csdev); + if (ret) + goto out_unlock; + + mutex_unlock(&coresight_mutex); + + if (cti_assoc_ops && cti_assoc_ops->add) + cti_assoc_ops->add(csdev); + + return csdev; out_unlock: mutex_unlock(&coresight_mutex); - /* Success */ - if (!ret) { - if (cti_assoc_ops && cti_assoc_ops->add) - cti_assoc_ops->add(csdev); - return csdev; - } /* Unregister the device if needed */ if (registered) { -- 2.34.1