From patchwork Mon Jul 18 12:14:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 591581 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 322DACCA485 for ; Mon, 18 Jul 2022 12:14:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234978AbiGRMOa (ORCPT ); Mon, 18 Jul 2022 08:14:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234951AbiGRMO1 (ORCPT ); Mon, 18 Jul 2022 08:14:27 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A645B1A04A for ; Mon, 18 Jul 2022 05:14:25 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oDPdh-0005d7-6Y; Mon, 18 Jul 2022 14:14:17 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oDPde-001i3q-Sy; Mon, 18 Jul 2022 14:14:14 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oDPde-005xVM-2R; Mon, 18 Jul 2022 14:14:14 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Georgi Djakov , Shawn Guo , Sascha Hauer Cc: kernel@pengutronix.de, Fabio Estevam , NXP Linux Team , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/8] interconnect: imx: Ignore return value of icc_provider_del() in .remove() Date: Mon, 18 Jul 2022 14:14:02 +0200 Message-Id: <20220718121409.171773-2-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> References: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1010; h=from:subject; bh=5nfrAM364jApg4Q2MKumCrNEZPHrPDHSb2BBL1GlFyE=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBi1U51Bo/VP+y2LBs+bQ2iRcEHbN/g7A/4uFcglu5y qC3AKbSJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtVOdQAKCRDB/BR4rcrsCZqvB/ 9hWfAifxAcGqp8Uiy8/z98ko8j0zZM/C09D66GMAFl1yTDfz2NvcwV52aphTRMrD8sS2Cgm9Y4r754 fGkfiGs4UlqQ/PAU8pT3aTW0xLWOqnYGEFDdWPtBU9+0aJuRh918sd/Axxf830NM9LgKzYZyRWCCVF fPze1raCc+1o4n/1u/MQ5b0C2paSy20X57zgAF3bgSskWBGhn28pQoHZ/D+pkzYIY5aDQ7gE6LBDdC mmdRkQetYH7MJYQsIQmsiG9bWeNSroz58NjYOSfS1XAZnW3X1eCmH7TH/E6KeqKabAQNSR9IZrMCRq j7u0merMlnMVnsbyv2XpZxZVMpEo5J X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-pm@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org icc_provider_del() already emits an error message on failure. In this case letting .remove() return the corresponding error code results in another error message and the device is removed anyhow. (See platform_remove().) So ignore the return value of icc_provider_del() and return 0 unconditionally. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König --- drivers/interconnect/imx/imx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/interconnect/imx/imx.c b/drivers/interconnect/imx/imx.c index 249ca25d1d55..4c70530e3064 100644 --- a/drivers/interconnect/imx/imx.c +++ b/drivers/interconnect/imx/imx.c @@ -280,7 +280,9 @@ int imx_icc_unregister(struct platform_device *pdev) imx_icc_unregister_nodes(provider); - return icc_provider_del(provider); + icc_provider_del(provider); + + return 0; } EXPORT_SYMBOL_GPL(imx_icc_unregister); From patchwork Mon Jul 18 12:14:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 591583 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 08B14C43334 for ; Mon, 18 Jul 2022 12:14:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234961AbiGRMO2 (ORCPT ); Mon, 18 Jul 2022 08:14:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234952AbiGRMOZ (ORCPT ); Mon, 18 Jul 2022 08:14:25 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C7311A04D for ; Mon, 18 Jul 2022 05:14:23 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oDPdg-0005d8-F0; Mon, 18 Jul 2022 14:14:16 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oDPde-001i3u-VS; Mon, 18 Jul 2022 14:14:14 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oDPde-005xVP-84; Mon, 18 Jul 2022 14:14:14 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Andy Gross , Bjorn Andersson , Georgi Djakov Cc: kernel@pengutronix.de, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/8] interconnect: icc-rpm: Ignore return value of icc_provider_del() in .remove() Date: Mon, 18 Jul 2022 14:14:03 +0200 Message-Id: <20220718121409.171773-3-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> References: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1077; h=from:subject; bh=uiTryKzy9Ktzb3mNysXudEYw9T8hjrPFSFUDOIoCHGE=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBi1U54DBHDAilwBL6MlUFk0KjKJ2pw2UfdD3SolwxQ kIZRiNyJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtVOeAAKCRDB/BR4rcrsCSWMB/ 9DVXamekMik/9jBrdtZnmwsnE6Wr2RSV+lTWCIWpOg/L2UpBQyHst3hMG4iZejSgB+DNZKgamQ8icg /3aTQNJt2Ve97UjsVNIcWdrWAOouJWqZOvk9VCO8tNq8XYcLD8cQbc4cEYVI51I1pYJcqF0mIV0lYq 5hzPyC9vvwpWTue8sdElCN1uKHwf6bGPDMvfmGe5c4aSnTE6iLkhv17P0IzOTtQLQb9rdYPD6LVWGN CLPpiEkulhAYWXsyXKm9sPXYkCp/SNK1TlXUd9daS99VYGkDDseILdvnur/ucVXptKpe6khCsHUguy kdaKS1pY0QKp85YdQgUvD8gOe8uBy/ X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-pm@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org icc_provider_del() already emits an error message on failure. In this case letting .remove() return the corresponding error code results in another error message and the device is removed anyhow. (See platform_remove().) So ignore the return value of icc_provider_del() and return 0 unconditionally. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König --- drivers/interconnect/qcom/icc-rpm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c index fb013191c29b..189c25f8207a 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -447,6 +447,8 @@ int qnoc_remove(struct platform_device *pdev) icc_nodes_remove(&qp->provider); clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks); - return icc_provider_del(&qp->provider); + icc_provider_del(&qp->provider); + + return 0; } EXPORT_SYMBOL(qnoc_remove); From patchwork Mon Jul 18 12:14:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 591584 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 11D4FC43334 for ; Mon, 18 Jul 2022 12:14:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234953AbiGRMOZ (ORCPT ); Mon, 18 Jul 2022 08:14:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234941AbiGRMOY (ORCPT ); Mon, 18 Jul 2022 08:14:24 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 946C01A046 for ; Mon, 18 Jul 2022 05:14:23 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oDPdg-0005dA-97; Mon, 18 Jul 2022 14:14:16 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oDPdf-001i40-3U; Mon, 18 Jul 2022 14:14:15 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oDPde-005xVS-Cx; Mon, 18 Jul 2022 14:14:14 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Andy Gross , Bjorn Andersson , Georgi Djakov Cc: kernel@pengutronix.de, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/8] interconnect: icc-rpmh: Ignore return value of icc_provider_del() in .remove() Date: Mon, 18 Jul 2022 14:14:04 +0200 Message-Id: <20220718121409.171773-4-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> References: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1110; h=from:subject; bh=4P7pEEWJE4q945kfcZ1EiPaX1AVcTXRUZ4+IUCb3Z4Q=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBi1U58v9/JBoqQ4Ftg7dm4gkIhxFUBmOGzdaIgyhvd Ao7XKCOJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtVOfAAKCRDB/BR4rcrsCZMDB/ 4gsxSFJ6J4Ect7uJmyGCSAhW6HvQlti9VBz89vHEkdEv3D0sF0HcdZGt3SmsK628OYw9GY6rSJzRhB FZNi2gO2pkxX+ABUTmVyVsBCyvxDDWWje0p993HE55zGBo98e0T30e+/PpdxWolDYCpQglu3M7Xab/ ijEVz0sStyFMN5IvhWbQ6x6qMo64VgUlzcirjyfPp7Md27M6iO0Y695W1x2/UnhKGFfh3zNfySzXCV aPE0oKRaJONqIObB0HMY5TWMMNjfVzKfqzrM+zlED4pEix3jnL9QKdGTPiV2F+VbtF3SBo4LEdgbKA i99vMCwFBIYkyepdaL6/o5VSfSsdms X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-pm@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org icc_provider_del() already emits an error message on failure. In this case letting .remove() return the corresponding error code results in another error message and the device is removed anyhow. (See platform_remove().) So ignore the return value of icc_provider_del() and return 0 unconditionally. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König --- drivers/interconnect/qcom/icc-rpmh.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/interconnect/qcom/icc-rpmh.c b/drivers/interconnect/qcom/icc-rpmh.c index 3c40076eb5fb..5846dafbe40e 100644 --- a/drivers/interconnect/qcom/icc-rpmh.c +++ b/drivers/interconnect/qcom/icc-rpmh.c @@ -271,7 +271,9 @@ int qcom_icc_rpmh_remove(struct platform_device *pdev) struct qcom_icc_provider *qp = platform_get_drvdata(pdev); icc_nodes_remove(&qp->provider); - return icc_provider_del(&qp->provider); + icc_provider_del(&qp->provider); + + return 0; } EXPORT_SYMBOL_GPL(qcom_icc_rpmh_remove); From patchwork Mon Jul 18 12:14:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 591804 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 66F11CCA47F for ; Mon, 18 Jul 2022 12:14:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234972AbiGRMO3 (ORCPT ); Mon, 18 Jul 2022 08:14:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234955AbiGRMOZ (ORCPT ); Mon, 18 Jul 2022 08:14:25 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E27521A046 for ; Mon, 18 Jul 2022 05:14:24 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oDPdg-0005dB-97; Mon, 18 Jul 2022 14:14:16 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oDPdf-001i44-CS; Mon, 18 Jul 2022 14:14:15 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oDPde-005xVV-Ix; Mon, 18 Jul 2022 14:14:14 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Andy Gross , Bjorn Andersson , Georgi Djakov Cc: kernel@pengutronix.de, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/8] interconnect: msm8974: Ignore return value of icc_provider_del() in .remove() Date: Mon, 18 Jul 2022 14:14:05 +0200 Message-Id: <20220718121409.171773-5-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> References: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1126; h=from:subject; bh=FJpmWEXN+H+dGnE/UQ8dINtNJBHBVROLu55mJZbljTU=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBi1U5/n8V4MYO8Y+Zd92pavKNcD2A1mz6JcJosSBcZ rJbUi5GJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtVOfwAKCRDB/BR4rcrsCc7nB/ 4w5+KeQHTMWPcF99k4itfpcfFB76jJd8Aww4ey6+keJNxd0YHv7L+fLPESeYCg8qtvaWvTLCYjP4pU AHJWz3e5X3Assxd85GrMTL+1kUbrl18mWO/taSKtr2C/GJcE0hekg0CKJdtIH4l1LJI3Bgm1lS5Nid Swf2dx9A053mUy0OUIKsTZmi+hdMrA3L1+CqXrqt9aklZh8HZL9Q9/VnxDiTMtOuaraiV/P3XjYc/r /xTL/LpViys99gCXKcLMH97Z9h+t1ulrXarzaQXu1KbLiYcdW70fhS26HlgsHuXWt0NfhOJ83tGbw7 WS6wdzi4Qb5RfWsDu5I+cL+Ltv4MNu X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-pm@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org icc_provider_del() already emits an error message on failure. In this case letting .remove() return the corresponding error code results in another error message and the device is removed anyhow. (See platform_remove().) So ignore the return value of icc_provider_del() and return 0 unconditionally. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König --- drivers/interconnect/qcom/msm8974.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/interconnect/qcom/msm8974.c b/drivers/interconnect/qcom/msm8974.c index 6fa0ad90fc3d..5ea192f1141d 100644 --- a/drivers/interconnect/qcom/msm8974.c +++ b/drivers/interconnect/qcom/msm8974.c @@ -749,7 +749,9 @@ static int msm8974_icc_remove(struct platform_device *pdev) icc_nodes_remove(&qp->provider); clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks); - return icc_provider_del(&qp->provider); + icc_provider_del(&qp->provider); + + return 0; } static const struct of_device_id msm8974_noc_of_match[] = { From patchwork Mon Jul 18 12:14:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 591582 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 A9227C43334 for ; Mon, 18 Jul 2022 12:14:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234958AbiGRMO3 (ORCPT ); Mon, 18 Jul 2022 08:14:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234941AbiGRMO0 (ORCPT ); Mon, 18 Jul 2022 08:14:26 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E6D51A055 for ; Mon, 18 Jul 2022 05:14:25 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oDPdg-0005dC-GV; Mon, 18 Jul 2022 14:14:16 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oDPdf-001i4A-P6; Mon, 18 Jul 2022 14:14:15 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oDPde-005xVY-Q5; Mon, 18 Jul 2022 14:14:14 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Andy Gross , Bjorn Andersson , Georgi Djakov Cc: kernel@pengutronix.de, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/8] interconnect: osm-l3: Ignore return value of icc_provider_del() in .remove() Date: Mon, 18 Jul 2022 14:14:06 +0200 Message-Id: <20220718121409.171773-6-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> References: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1130; h=from:subject; bh=HNuht24ycHig2U9tMEFymwQoUB3pBJxXewoNYOtG2i4=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBi1U6CqwBQWbkBuGbcKJe2ciTj5GsxJmJWl1vIGWO6 0ao3iieJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtVOggAKCRDB/BR4rcrsCU33B/ 0UDJZXAQgV+SdM7dUPKAeT+QmPOUJdV0NeyIbrOFXhvvwkzo5isAirPpV/03H+kKssoFmXqYwRESoY 0hFgRIMBEamTQpJItuRNirQ7BdZyghxRO5SqZKsJM8/xBScqe7lf28Q8GkOB4kDNDhZzu7Yb2wD+mM nNoqIsB+mGtNQBL1c80MHFSd+HzaYr+qmpNA+c7Qr9dtnywyT4M0cY5ey/kYiwhJF8HH/TWNavhv5D f7e7vcUiWRo/GKUo9MrdgrLlT6jShDfpDGQfOnIhxm7/5xTbCoGutOIJ8zIWpaxDz0Xi6TbMHC9CKu WyiQHNi+ZiORazHMg/H1r+w7ygLUZn X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-pm@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org icc_provider_del() already emits an error message on failure. In this case letting .remove() return the corresponding error code results in another error message and the device is removed anyhow. (See platform_remove().) So ignore the return value of icc_provider_del() and return 0 unconditionally. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König --- drivers/interconnect/qcom/osm-l3.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/interconnect/qcom/osm-l3.c b/drivers/interconnect/qcom/osm-l3.c index 4198656f4e59..ddbdf0943f94 100644 --- a/drivers/interconnect/qcom/osm-l3.c +++ b/drivers/interconnect/qcom/osm-l3.c @@ -217,7 +217,9 @@ static int qcom_osm_l3_remove(struct platform_device *pdev) struct qcom_osm_l3_icc_provider *qp = platform_get_drvdata(pdev); icc_nodes_remove(&qp->provider); - return icc_provider_del(&qp->provider); + icc_provider_del(&qp->provider); + + return 0; } static int qcom_osm_l3_probe(struct platform_device *pdev) From patchwork Mon Jul 18 12:14:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 591805 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 CA93DCCA485 for ; Mon, 18 Jul 2022 12:14:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234956AbiGRMO0 (ORCPT ); Mon, 18 Jul 2022 08:14:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234949AbiGRMOY (ORCPT ); Mon, 18 Jul 2022 08:14:24 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F5F51A052 for ; Mon, 18 Jul 2022 05:14:23 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oDPdg-0005dD-Gf; Mon, 18 Jul 2022 14:14:16 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oDPdf-001i49-Oz; Mon, 18 Jul 2022 14:14:15 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oDPde-005xVc-WA; Mon, 18 Jul 2022 14:14:14 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Andy Gross , Bjorn Andersson , Georgi Djakov Cc: kernel@pengutronix.de, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/8] interconnect: sm8450: Ignore return value of icc_provider_del() in .remove() Date: Mon, 18 Jul 2022 14:14:07 +0200 Message-Id: <20220718121409.171773-7-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> References: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1112; h=from:subject; bh=GTV9eacUuhiHphB1ypMvxTcWIkrDqL5+D9Tl8L+fq6I=; b=owGbwMvMwMV48I9IxdpTbzgZT6slMSRd9Wu5fVV8vi2LngKn02/meU7L8k+vdMwKl/6/+692dVCp 2nK2TkZjFgZGLgZZMUWWuiItsQkSa/7blSzhhhnEygQyhYGLUwAm4jWb/b+z3bwCKQ7bpoIP+7KU9W 77OOX1SMV+Vr5VrfjbtknyIl94w4MtsSsP38wySp0lt2CWqGQuo+drW5GZhVwr7rnbn9o39cc5xp7J pf13eU4W8f2s/lStGfturQXDOy5VFcai906PWMq6uH62tLIkJ2lqJW1bIbHr0tckq1ZGkYuNopcztr hGZnMEGRWkTj+/PFk/z8Z/+qFnqx/UdU166L9H/ZZ6omP4NiubsLibu24/zHNVMIs2vPtc+JbQyehd XNyzzvEYxO8te9w6b/vtxYpxKdOfZf/2LI/09fg9P5mrrF50g/yXOvWgbDZRmV1Nax/pLOJcf1fKMf JozsSOWMsFjI2TXs98FHUvM9ARAA== X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-pm@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org icc_provider_del() already emits an error message on failure. In this case letting .remove() return the corresponding error code results in another error message and the device is removed anyhow. (See platform_remove().) So ignore the return value of icc_provider_del() and return 0 unconditionally. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König --- drivers/interconnect/qcom/sm8450.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/interconnect/qcom/sm8450.c b/drivers/interconnect/qcom/sm8450.c index 7e3d372b712f..613c30df8aed 100644 --- a/drivers/interconnect/qcom/sm8450.c +++ b/drivers/interconnect/qcom/sm8450.c @@ -1932,7 +1932,9 @@ static int qnoc_remove(struct platform_device *pdev) struct qcom_icc_provider *qp = platform_get_drvdata(pdev); icc_nodes_remove(&qp->provider); - return icc_provider_del(&qp->provider); + icc_provider_del(&qp->provider); + + return 0; } static const struct of_device_id qnoc_of_match[] = { From patchwork Mon Jul 18 12:14:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 591806 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 115D9C43334 for ; Mon, 18 Jul 2022 12:14:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234895AbiGRMOU (ORCPT ); Mon, 18 Jul 2022 08:14:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234941AbiGRMOT (ORCPT ); Mon, 18 Jul 2022 08:14:19 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FAE819C3E for ; Mon, 18 Jul 2022 05:14:18 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oDPdg-0005dQ-Sj; Mon, 18 Jul 2022 14:14:16 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oDPdg-001i4F-66; Mon, 18 Jul 2022 14:14:16 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oDPdf-005xVi-63; Mon, 18 Jul 2022 14:14:15 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Georgi Djakov Cc: kernel@pengutronix.de, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/8] interconnect: Make icc_provider_del() return void Date: Mon, 18 Jul 2022 14:14:08 +0200 Message-Id: <20220718121409.171773-8-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> References: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2511; h=from:subject; bh=KwOYyFw1oDwrBpkoEkiLKczRlYc1LhavekTYkDpsLjU=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBi1U6I0hVpMyRN5RJKYZPFnvTZK8VO17RPuR2YNOXe A1RdZkyJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtVOiAAKCRDB/BR4rcrsCT9KB/ 9+AJarsM209wzSl2gBsVkJNEr+CQ+o0203QgzSVD5M6Qhi6hGUr1YDeSz4SH8yyrIYj8UmyxIR9c80 FowTJ8B5RzWPpysfFb67+W9i/br/vSe5oh6646OBMhiS211SxaUvvurPI86g0hN4W7RS4kxDv3nMmi ilurGHDcV6b9z0U94tyfBAlP/avoueQytWTJFYuaF0RsaMVDEWP9T1Il9qMugstuEkdYu/PdSHP0Bk 04d92AMkZ/2jn5moW/qtWcXvPYH97Oj1jVjHVcF4e6SBT6mpYIgXnmocyB+yQeJHwDktvCkA8CY0D2 A7Uzg7bdEWFxZtlzBqvrT3c+eJCoYF X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-pm@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org All users ignore the return value of icc_provider_del(). Consequently make it not return an error code. Signed-off-by: Uwe Kleine-König --- drivers/interconnect/core.c | 10 +++------- include/linux/interconnect-provider.h | 5 ++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index 808f6e7a8048..25debded65a8 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -1057,29 +1057,25 @@ EXPORT_SYMBOL_GPL(icc_provider_add); /** * icc_provider_del() - delete previously added interconnect provider * @provider: the interconnect provider that will be removed from topology - * - * Return: 0 on success, or an error code otherwise */ -int icc_provider_del(struct icc_provider *provider) +void icc_provider_del(struct icc_provider *provider) { mutex_lock(&icc_lock); if (provider->users) { pr_warn("interconnect provider still has %d users\n", provider->users); mutex_unlock(&icc_lock); - return -EBUSY; + return; } if (!list_empty(&provider->nodes)) { pr_warn("interconnect provider still has nodes\n"); mutex_unlock(&icc_lock); - return -EBUSY; + return; } list_del(&provider->provider_list); mutex_unlock(&icc_lock); - - return 0; } EXPORT_SYMBOL_GPL(icc_provider_del); diff --git a/include/linux/interconnect-provider.h b/include/linux/interconnect-provider.h index 6bd01f7159c6..cd5c5a27557f 100644 --- a/include/linux/interconnect-provider.h +++ b/include/linux/interconnect-provider.h @@ -123,7 +123,7 @@ void icc_node_add(struct icc_node *node, struct icc_provider *provider); void icc_node_del(struct icc_node *node); int icc_nodes_remove(struct icc_provider *provider); int icc_provider_add(struct icc_provider *provider); -int icc_provider_del(struct icc_provider *provider); +void icc_provider_del(struct icc_provider *provider); struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec); void icc_sync_state(struct device *dev); @@ -172,9 +172,8 @@ static inline int icc_provider_add(struct icc_provider *provider) return -ENOTSUPP; } -static inline int icc_provider_del(struct icc_provider *provider) +static inline void icc_provider_del(struct icc_provider *provider) { - return -ENOTSUPP; } static inline struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec) From patchwork Mon Jul 18 12:14:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 591802 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 462D9C433EF for ; Mon, 18 Jul 2022 12:14:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234984AbiGRMOd (ORCPT ); Mon, 18 Jul 2022 08:14:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234980AbiGRMOb (ORCPT ); Mon, 18 Jul 2022 08:14:31 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 051D819C2C for ; Mon, 18 Jul 2022 05:14:31 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oDPdh-0005dj-6e; Mon, 18 Jul 2022 14:14:17 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oDPdg-001i4I-A7; Mon, 18 Jul 2022 14:14:16 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oDPdf-005xVl-CK; Mon, 18 Jul 2022 14:14:15 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Georgi Djakov , Shawn Guo , Sascha Hauer Cc: kernel@pengutronix.de, Fabio Estevam , NXP Linux Team , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 8/8] interconnect: imx: Make imx_icc_unregister() return void Date: Mon, 18 Jul 2022 14:14:09 +0200 Message-Id: <20220718121409.171773-9-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> References: <20220718121409.171773-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3164; h=from:subject; bh=7KukAtvH5Bq30kuEwIg28LJ8PMRL6qo8BHa0A2/HLbM=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBi1U6L0VFV3l2yU6+MVs4rL1Au6U6sq+5+aOG/8TLT qP+54gSJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtVOiwAKCRDB/BR4rcrsCQAkB/ sExEC9/a27LpzoAmm9arvb2mSjacbH8owpFfCIgl8F7PQfxRwhHjc/VjVMcRUT/MeeZmW7PYgoTYQp ea0+dM9bMjLYCbwOcFUBJDta9yJkHl1YCMk5r/LqB8i61ZOrJF4XilbKfNHMk6uHkg/t3tPirVSIqA DRZAL6KBkXgczR0l3x8tOlWFRrhKu+xEN0jh5Ub+6oQoCfjCzYe2+z8PasllWb5KgkTjLMeWi3jEN8 TP7Wm38wOcOsMDTDgZ6Z0fCNFbD6J3uS48fb4baB2hZ36qLlOPzOddEfa7qtLGZ5m34Hq5/A6Y3xm6 6UYB8QCu+wKFP3YjFC4eXGhITtsIN3 X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-pm@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The function imx_icc_unregister() returns zero unconditionally. Make it return void. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König --- drivers/interconnect/imx/imx.c | 4 +--- drivers/interconnect/imx/imx.h | 2 +- drivers/interconnect/imx/imx8mm.c | 4 +++- drivers/interconnect/imx/imx8mn.c | 4 +++- drivers/interconnect/imx/imx8mq.c | 4 +++- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/interconnect/imx/imx.c b/drivers/interconnect/imx/imx.c index 4c70530e3064..e96794acad59 100644 --- a/drivers/interconnect/imx/imx.c +++ b/drivers/interconnect/imx/imx.c @@ -274,15 +274,13 @@ int imx_icc_register(struct platform_device *pdev, } EXPORT_SYMBOL_GPL(imx_icc_register); -int imx_icc_unregister(struct platform_device *pdev) +void imx_icc_unregister(struct platform_device *pdev) { struct icc_provider *provider = platform_get_drvdata(pdev); imx_icc_unregister_nodes(provider); icc_provider_del(provider); - - return 0; } EXPORT_SYMBOL_GPL(imx_icc_unregister); diff --git a/drivers/interconnect/imx/imx.h b/drivers/interconnect/imx/imx.h index 75da51076c68..b533c9a99710 100644 --- a/drivers/interconnect/imx/imx.h +++ b/drivers/interconnect/imx/imx.h @@ -56,6 +56,6 @@ struct imx_icc_node_desc { int imx_icc_register(struct platform_device *pdev, struct imx_icc_node_desc *nodes, int nodes_count); -int imx_icc_unregister(struct platform_device *pdev); +void imx_icc_unregister(struct platform_device *pdev); #endif /* __DRIVERS_INTERCONNECT_IMX_H */ diff --git a/drivers/interconnect/imx/imx8mm.c b/drivers/interconnect/imx/imx8mm.c index 1083490bb391..fa9639c6ea37 100644 --- a/drivers/interconnect/imx/imx8mm.c +++ b/drivers/interconnect/imx/imx8mm.c @@ -88,7 +88,9 @@ static int imx8mm_icc_probe(struct platform_device *pdev) static int imx8mm_icc_remove(struct platform_device *pdev) { - return imx_icc_unregister(pdev); + imx_icc_unregister(pdev); + + return 0; } static struct platform_driver imx8mm_icc_driver = { diff --git a/drivers/interconnect/imx/imx8mn.c b/drivers/interconnect/imx/imx8mn.c index ad97e55fd4e5..3b11571c23d0 100644 --- a/drivers/interconnect/imx/imx8mn.c +++ b/drivers/interconnect/imx/imx8mn.c @@ -77,7 +77,9 @@ static int imx8mn_icc_probe(struct platform_device *pdev) static int imx8mn_icc_remove(struct platform_device *pdev) { - return imx_icc_unregister(pdev); + imx_icc_unregister(pdev); + + return 0; } static struct platform_driver imx8mn_icc_driver = { diff --git a/drivers/interconnect/imx/imx8mq.c b/drivers/interconnect/imx/imx8mq.c index d7768d3c6d8a..fb19b90d6767 100644 --- a/drivers/interconnect/imx/imx8mq.c +++ b/drivers/interconnect/imx/imx8mq.c @@ -87,7 +87,9 @@ static int imx8mq_icc_probe(struct platform_device *pdev) static int imx8mq_icc_remove(struct platform_device *pdev) { - return imx_icc_unregister(pdev); + imx_icc_unregister(pdev); + + return 0; } static struct platform_driver imx8mq_icc_driver = {