From patchwork Wed Mar 12 11:40:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 14013488 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A2E3EC28B28 for ; Wed, 12 Mar 2025 12:41:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=YTLAF0tIpFzXbv7BL0TTLvyumrvT+IHuJUXwb+Jj2tI=; b=yRayuvq47/S+yUhXgdV2/7Hg+F jKsDxORL2Prlrcf3Rz5KQKIYwdScRE1inyc2+6B4lblbwDPydIEKAQ0R1X/bflfPwCwLATRMxYkTH YBwSx6RYoC3Rwbjx0xjn1Pn0DkX7j6hHdYqRznbNOH8RQGDbNwSEbln7MQHrKxgt3RKVnZypPUcp3 14r70PlHZR5GDnQ8CNt6Wco5N+yrr1jSZbdxs6IVCUiWsLz961McvNqU1VEEOuZap6TWCWXcvEpTx M/2/xQuc2GAfPrbxgEjtvlV+9SnS7LcNfYJSbiiNwkNbOMoLeITeTuLHseT1PF2wJaS4mfi86zI7f HzymW8AQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tsLP8-00000008R2T-2J5f; Wed, 12 Mar 2025 12:41:46 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tsKS6-00000008IMT-23Ay for linux-arm-kernel@lists.infradead.org; Wed, 12 Mar 2025 11:40:47 +0000 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 E59D116A3; Wed, 12 Mar 2025 04:40:56 -0700 (PDT) Received: from e133711.arm.com (e133711.arm.com [10.1.196.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 71C343F694; Wed, 12 Mar 2025 04:40:45 -0700 (PDT) From: Sudeep Holla Date: Wed, 12 Mar 2025 11:40:26 +0000 Subject: [PATCH 3/3] firmware: arm_scmi: Refactor error logging from SCMI device creation to single helper MIME-Version: 1.0 Message-Id: <20250312-b4-scmi_minor_cleanup-v1-3-c62c6cb4111a@arm.com> References: <20250312-b4-scmi_minor_cleanup-v1-0-c62c6cb4111a@arm.com> In-Reply-To: <20250312-b4-scmi_minor_cleanup-v1-0-c62c6cb4111a@arm.com> To: arm-scmi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Sudeep Holla , Cristian Marussi X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3348; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=0VunvKId+eIYxYj8ySEheQ8DibsTe7qSHuPUkpqsZwU=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBn0XK6Jdwi+oy667VHsmKiUVy0gTlQ8w3gayKT3 UPcvu/qiy6JAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZ9FyugAKCRAAQbq8MX7i mPXnD/4ht/Ofjlu9URm34XojyW+8Gu/WXXcEh6WPL3RDaVtqTo7NcJds4KqaAOXwy/LnJk82b3Y pOGEiTyG2fs/sGJ4aN2B1yIC9pspkeDrfIWNbwguFFVD2/9EE6O4fdGp83EAxpy0m3bG26pKF1H R5JuFHx0Rz3yBxm1vxEc43Le1eWYWY16sv3VGX5eY/L+iDwGpX3FnVAAheo/WrrJ0VheKXsibv2 SMZwjsIXZsPlRNJmGvbM4tS7v5G6jJr0BqLyVxw8mw1CA7GVLtfj85Lq3Ji4mDrMPv533jZuPXS 6WSofQ/63CbsoJ/FxGl718nvHEuzHsJYG/NpiNzvdz8S0NAvl/4Zfk3knyLmYjyPHqzPPoXTTmn Mjv84bhL7d8VN8d0v7cJmp7ZHol24jF66jVG/dm/TVjXwNODlijTrtnkbTSus4FaDLhHPk7ve5h FadtXrc6dDBIgeg+f2iy4RNdTgSa3wY/w9Y6vDiDPIlbBINbFKnPdQQF34VfM2ZSyT07QFellcL 7haa8Q+figqNXU4/Fmh/kZkPB3/BVyGNluBWCUvdPIEGg7/Jmt4PnxNPSM0039gUjpP2BQ0w0pM 8tWrV+P5q3crTEa+UDgWdmNpefxD4YTwYhXlmbz70mdNcXhoSztOsD+CO8kNgvUJOKMnEXnJiWd FiC/MvGBeyMtf0Q== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250312_044046_623593_5DA6FEEB X-CRM114-Status: GOOD ( 12.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Refactors the error logging related to SCMI device creation. The goal is to remove duplicated error-handling code and centralize it into a single helper function: _scmi_device_create(). By doing so, any code redundancy around error logging is avoided, as error logging during device creation will now be handled by a unified helper function. Signed-off-by: Sudeep Holla --- drivers/firmware/arm_scmi/bus.c | 29 +++++++++++++++++++---------- drivers/firmware/arm_scmi/driver.c | 8 +------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c index a30fd8e05e423e226a63833f309d8d30c400fabd..493e2c63b107fd9063f11034b71d65f567bb0778 100644 --- a/drivers/firmware/arm_scmi/bus.c +++ b/drivers/firmware/arm_scmi/bus.c @@ -411,6 +411,20 @@ __scmi_device_create(struct device_node *np, struct device *parent, return NULL; } +static struct scmi_device * +_scmi_device_create(struct device_node *np, struct device *parent, + int protocol, const char *name) +{ + struct scmi_device *sdev; + + sdev = __scmi_device_create(np, parent, protocol, name); + if (!sdev) + pr_err("(%s) Failed to create device for protocol 0x%x (%s)\n", + of_node_full_name(parent->of_node), protocol, name); + + return sdev; +} + /** * scmi_device_create - A method to create one or more SCMI devices * @@ -443,7 +457,7 @@ struct scmi_device *scmi_device_create(struct device_node *np, struct scmi_device *scmi_dev = NULL; if (name) - return __scmi_device_create(np, parent, protocol, name); + return _scmi_device_create(np, parent, protocol, name); mutex_lock(&scmi_requested_devices_mtx); phead = idr_find(&scmi_requested_devices, protocol); @@ -457,18 +471,13 @@ struct scmi_device *scmi_device_create(struct device_node *np, list_for_each_entry(rdev, phead, node) { struct scmi_device *sdev; - sdev = __scmi_device_create(np, parent, - rdev->id_table->protocol_id, - rdev->id_table->name); - /* Report errors and carry on... */ + sdev = _scmi_device_create(np, parent, + rdev->id_table->protocol_id, + rdev->id_table->name); if (sdev) scmi_dev = sdev; - else - pr_err("(%s) Failed to create device for protocol 0x%x (%s)\n", - of_node_full_name(parent->of_node), - rdev->id_table->protocol_id, - rdev->id_table->name); } + mutex_unlock(&scmi_requested_devices_mtx); return scmi_dev; diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 60050da54bf24c0245290e846f91aea62392855b..b80c574cb3bb2f12b2980fc844ea3da10abdc9f1 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -439,14 +439,8 @@ static void scmi_create_protocol_devices(struct device_node *np, struct scmi_info *info, int prot_id, const char *name) { - struct scmi_device *sdev; - mutex_lock(&info->devreq_mtx); - sdev = scmi_device_create(np, info->dev, prot_id, name); - if (name && !sdev) - dev_err(info->dev, - "failed to create device for protocol 0x%X (%s)\n", - prot_id, name); + scmi_device_create(np, info->dev, prot_id, name); mutex_unlock(&info->devreq_mtx); }