From patchwork Fri Jul 15 20:36:45 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: 591276 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 7AC95CCA483 for ; Fri, 15 Jul 2022 20:37:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231386AbiGOUhU (ORCPT ); Fri, 15 Jul 2022 16:37:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231404AbiGOUhR (ORCPT ); Fri, 15 Jul 2022 16:37:17 -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 3CBE987235 for ; Fri, 15 Jul 2022 13:37:16 -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 1oCS3Z-0004t5-Jc; Fri, 15 Jul 2022 22:37:01 +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 1oCS3X-001BFQ-FF; Fri, 15 Jul 2022 22:36:59 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oCS3W-005PyA-PX; Fri, 15 Jul 2022 22:36:58 +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 1/8] interconnect: imx: Ignore return value of icc_provider_del() in .remove() Date: Fri, 15 Jul 2022 22:36:45 +0200 Message-Id: <20220715203652.89912-2-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220715203652.89912-1-u.kleine-koenig@pengutronix.de> References: <20220715203652.89912-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/pANAwAKAcH8FHityuwJAcsmYgBi0c+UBo/VP+y2LBs+bQ2iRcEHbN/g7A/4uFcglu5y qC3AKbSJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtHPlAAKCRDB/BR4rcrsCYXKB/ 9e7oQWJIF1M1Xl5FvWEbSb5BXu1K7AvIQcjJPzVlJaI5Bx6Z8AVgIXan2Ym4J8NaBgfGGrp1wj2JGY vMxJEeLaQrfDaqg8aZQ8ThAk5C/nwseug5h/A0nw99x5312pjozaEunrhn/Rw3z6VHKY+dFGnZsQKJ g2+/amtMZoXI13U34kgy9TeleT21g9zjldtZXHwHBUen+25aqFLy5T7qXSsAbaOHYjELOXaBQcuKlh f6HNL3P7yKk6UEDHIbCtRer0TbrxQoC45H/Et3H5lY73xjK0Khbov0+Eu2Sx8XhJXrAYlgFba0cp/L F1ZPTN4MDPh5CJAWJ8y5470Xb/aOOV 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 Fri Jul 15 20:36:46 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: 591103 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 72A50CCA483 for ; Fri, 15 Jul 2022 20:37:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231354AbiGOUhR (ORCPT ); Fri, 15 Jul 2022 16:37:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231359AbiGOUhP (ORCPT ); Fri, 15 Jul 2022 16:37:15 -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 54C2485D55 for ; Fri, 15 Jul 2022 13:37:14 -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 1oCS3Y-0004t6-GV; Fri, 15 Jul 2022 22:37:00 +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 1oCS3X-001BFV-OD; Fri, 15 Jul 2022 22:36:59 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oCS3W-005PyD-W4; Fri, 15 Jul 2022 22:36:58 +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 2/8] interconnect: icc-rpm: Ignore return value of icc_provider_del() in .remove() Date: Fri, 15 Jul 2022 22:36:46 +0200 Message-Id: <20220715203652.89912-3-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220715203652.89912-1-u.kleine-koenig@pengutronix.de> References: <20220715203652.89912-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/pANAwAKAcH8FHityuwJAcsmYgBi0c+YDBHDAilwBL6MlUFk0KjKJ2pw2UfdD3SolwxQ kIZRiNyJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtHPmAAKCRDB/BR4rcrsCYuVB/ 4z8K8ezfAkl8+qkHmofwpyUYVNfhK3T58nW6m/GphCnLfZKkK6dA21kZvxTIPfhwR6hZbWpIcaQRQV 0mVg8SJsKRAOhqpXusufELyekGY5sqtloEI7uoIaE2+m3M5Qtqb/B4uF5b/AhDVvIC9+Z9iJdKv1p/ JGOs2NYVTP8SdlCO69bj1hll0wUu9+j8wnBr5XpEB1TcRrQqxfZclYg8ehBdbD7avKoAJj+rR4qejD NiFPFUJn/HuD9BnIAJIu7yKBQzBuh7CeebvOTlkJHodd2uDRbQIismPUmHTPkTnWuDuK7DoCEYR8+1 b+n80xLTquyBFlN+49uzP0a2lCQJtc 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 Fri Jul 15 20:36:47 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: 591278 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 0DD0ACCA486 for ; Fri, 15 Jul 2022 20:37:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231359AbiGOUhS (ORCPT ); Fri, 15 Jul 2022 16:37:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231383AbiGOUhP (ORCPT ); Fri, 15 Jul 2022 16:37:15 -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 BD2E37E026 for ; Fri, 15 Jul 2022 13:37:14 -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 1oCS3Y-0004t7-M3; Fri, 15 Jul 2022 22:37:00 +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 1oCS3X-001BFZ-Tx; Fri, 15 Jul 2022 22:36:59 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oCS3X-005PyG-5g; Fri, 15 Jul 2022 22:36:59 +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 3/8] interconnect: icc-rpmh: Ignore return value of icc_provider_del() in .remove() Date: Fri, 15 Jul 2022 22:36:47 +0200 Message-Id: <20220715203652.89912-4-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220715203652.89912-1-u.kleine-koenig@pengutronix.de> References: <20220715203652.89912-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/pANAwAKAcH8FHityuwJAcsmYgBi0c+cv9/JBoqQ4Ftg7dm4gkIhxFUBmOGzdaIgyhvd Ao7XKCOJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtHPnAAKCRDB/BR4rcrsCVkuB/ 9CbWCt1xsrBlzvz9L90TCYedsAGyrP63SrZmM9+/uss9nnm1F1vUytWY6ZVwNZD2HDhBZbM/HWIZP4 njZsQVe+lnorCju1m7ly1HN5l/fCXnpZJwfIhAuNke6dop7Xce9Fhthx60++c/w3JAptNLOFtFOddZ VINCi2ykjbOYq6wndSeyWR163l5vb7bOqViS7iDNDhaIoqtuPNs8QUFEOuQaEfMyb52D5zOEF9ZxQ7 301yj+VRj4GOVqNZyUG+LOsoKYxpzyL5WsWnbEKcI5KgAWIGmEjmHy3CBVoAK3DsYGMxRUvy0Bg/zd FpocfUQD+T13leFZ/mwjYjs5BNle9Q 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 Fri Jul 15 20:36:48 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: 591102 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 252BEC43334 for ; Fri, 15 Jul 2022 20:37:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231424AbiGOUhT (ORCPT ); Fri, 15 Jul 2022 16:37:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231393AbiGOUhQ (ORCPT ); Fri, 15 Jul 2022 16:37:16 -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 3A95C87226 for ; Fri, 15 Jul 2022 13:37:15 -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 1oCS3Y-0004t9-W4; Fri, 15 Jul 2022 22:37:01 +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 1oCS3Y-001BFe-8Q; Fri, 15 Jul 2022 22:37:00 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oCS3X-005PyJ-BJ; Fri, 15 Jul 2022 22:36:59 +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 4/8] interconnect: msm8974: Ignore return value of icc_provider_del() in .remove() Date: Fri, 15 Jul 2022 22:36:48 +0200 Message-Id: <20220715203652.89912-5-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220715203652.89912-1-u.kleine-koenig@pengutronix.de> References: <20220715203652.89912-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/pANAwAKAcH8FHityuwJAcsmYgBi0c+fn8V4MYO8Y+Zd92pavKNcD2A1mz6JcJosSBcZ rJbUi5GJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtHPnwAKCRDB/BR4rcrsCdBsB/ 9kkHwaum6u26a2hQ0ySj2ctxX/0L6zjMeoDpWXFUhf/SCU7wK3d01/zw5LtAA9p2PPdIf3c0p6WpQD Pmw92i5lCmRAZrGTJEI/OaYnSIgIa4ehyPGGp/KNWUfs2q5jNMab+GVf64oOqZtzRwNzxbclktgMYT lHR5BEKD8KsD1OHrtRZusrRlwprEtGO8O1lR8a4Xz27nw6UyhVFA6NB5v95lDS3IYrWalMjCv52fxo 2XjSoSirQ3lQZQ4oJ3utTr33RYSRZd/VAwjSizn4kuGzHqvWQUVPHh1Czf+mkq/EGL1veI9yFx1vr6 qgQIQqbeJClOvQOAodMCge9QmD0nJO 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 Fri Jul 15 20:36:49 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: 591277 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 D5CE3C433EF for ; Fri, 15 Jul 2022 20:37:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231381AbiGOUhS (ORCPT ); Fri, 15 Jul 2022 16:37:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231390AbiGOUhQ (ORCPT ); Fri, 15 Jul 2022 16:37:16 -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 3945B8721B for ; Fri, 15 Jul 2022 13:37:15 -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 1oCS3Z-0004tF-3Y; Fri, 15 Jul 2022 22:37:01 +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 1oCS3Y-001BFi-C9; Fri, 15 Jul 2022 22:37:00 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oCS3X-005PyO-Hj; Fri, 15 Jul 2022 22:36:59 +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 5/8] interconnect: osm-l3: Ignore return value of icc_provider_del() in .remove() Date: Fri, 15 Jul 2022 22:36:49 +0200 Message-Id: <20220715203652.89912-6-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220715203652.89912-1-u.kleine-koenig@pengutronix.de> References: <20220715203652.89912-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/pANAwAKAcH8FHityuwJAcsmYgBi0c+jqwBQWbkBuGbcKJe2ciTj5GsxJmJWl1vIGWO6 0ao3iieJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtHPowAKCRDB/BR4rcrsCcUWB/ 4tWOQZEs4KzMawHjjhOIE0kh3iiRxR9V3HMtVBtzFaZLAddv+eWTr9BBjAQ0uyAHIRJFlQ1nqwOSiT 5xKoFrJdg+MVXgZxUEHZtior1MxiQwk4cGYabPkN3d/uW5HfMfhhuvUv8k9X2P7G/1tnftGQX76uZV zEZRpCCBmWv/eB3KYvfp/xLzVlUoOy57bk+q8FQPLzvvWcProHB8JOUv2ST1fZ8KTEa893kwhorCmh UFOybL7AAyGNfu7HbM0wt38DO0FdVjhTfCAI3aVvgJhS7YxMLUJxcYHNVXpoCj9GyHeVLk7m/htUWt tueHktx0vIqSo9eQBTDHFPLK/K3ROD 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 Fri Jul 15 20:36:50 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: 591279 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 3D007C43334 for ; Fri, 15 Jul 2022 20:37:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231370AbiGOUhP (ORCPT ); Fri, 15 Jul 2022 16:37:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231336AbiGOUhO (ORCPT ); Fri, 15 Jul 2022 16:37:14 -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 754EF7FE65 for ; Fri, 15 Jul 2022 13:37:13 -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 1oCS3Z-0004tP-AE; Fri, 15 Jul 2022 22:37:01 +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 1oCS3Y-001BFl-Ix; Fri, 15 Jul 2022 22:37:00 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oCS3X-005PyR-OE; Fri, 15 Jul 2022 22:36:59 +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 6/8] interconnect: sm8450: Ignore return value of icc_provider_del() in .remove() Date: Fri, 15 Jul 2022 22:36:50 +0200 Message-Id: <20220715203652.89912-7-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220715203652.89912-1-u.kleine-koenig@pengutronix.de> References: <20220715203652.89912-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=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBi0c+m29UXnz0ELiAJQvsDnkKmb8upQWpXG/+7/St7 UnUmpwaJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtHPpgAKCRDB/BR4rcrsCZdxCA CheZG90mzmYQbdtED2vTpZEiO2obu3kUkFcEyQsReov/OCFDIAWlgge9QVZxzBAIeyH40ms+1MB0OR 0gMYej9PPYdxoQKwnvSc1B8uIBX4R5I40voGFEe3/iLqCgCa5CeodX37QTcT6HoPbPI4sYTbKLaeDy P5N2/zpHgJ/zeFHBIEmgFI7Ra6DaPvuEsf88APbhV7pZ3SUxB5yhAslX5xmk7ej6BBHeNaYyQoP0uU JeBXPqTgmC23IW58fGE9NxppjCVcOvaAXmKTUvsDGCwxNx0UOQ/QEn2PtIByT6SRDfHpdq9+NnaGx5 NW9EXyf67gP92Vufz8GZhAFOZAPs3S 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 Fri Jul 15 20:36:51 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: 591104 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 D8E9AC43334 for ; Fri, 15 Jul 2022 20:37:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231243AbiGOUhF (ORCPT ); Fri, 15 Jul 2022 16:37:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230474AbiGOUhF (ORCPT ); Fri, 15 Jul 2022 16:37:05 -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 8443C7D1F2 for ; Fri, 15 Jul 2022 13:37:03 -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 1oCS3Z-0004tT-Ad; Fri, 15 Jul 2022 22:37:01 +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 1oCS3Y-001BFp-Ke; Fri, 15 Jul 2022 22:37:00 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oCS3X-005PyV-Tq; Fri, 15 Jul 2022 22:36:59 +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 7/8] interconnect: Make icc_provider_del() return void Date: Fri, 15 Jul 2022 22:36:51 +0200 Message-Id: <20220715203652.89912-8-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220715203652.89912-1-u.kleine-koenig@pengutronix.de> References: <20220715203652.89912-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2130; h=from:subject; bh=n7ouJxzj7vqUld5FBMHrGeB81LM5WBQ347j0wY3D8po=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBi0c+prNCY2MkDBjsDbX9CO0306kJbYFPVvfGSc0hD cE/xWRyJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtHPqQAKCRDB/BR4rcrsCVSfCA CAimBeZMb/So+BHgyWnIp6cAcWPOgbjLmfK20qFBx6OjUobP0sOcc3NL2Qx+oPM+GoAqpPOaonHeuP E03Ci7dgi0EewCsI6UbASjvaoWlei9Izfu4QzPKr4dZCL65H/afgRxsb9e780mD4HacGCoBrN4I8dg 3RgQhNj6JQBGgFq/UpEmAmCwV33L6/khHbfwjIZmo5yA1NImy68ECiwi6RcYr7FMrcsvDURlfI8uiC +LzLwSFNoGhWFxkyb17TMzq3eN9JqeRmQdRhFkax3CaTIfi56hF5s4blWQ+SkQnGiYeC+NR/Vc9lIt TW13nUPqPo2ApNvBMFFSUF1MPQqydi 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 | 2 +- 2 files changed, 4 insertions(+), 8 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..191f083d1f3b 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); From patchwork Fri Jul 15 20:36:52 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: 591101 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 9D443CCA487 for ; Fri, 15 Jul 2022 20:37:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231393AbiGOUhT (ORCPT ); Fri, 15 Jul 2022 16:37:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231395AbiGOUhQ (ORCPT ); Fri, 15 Jul 2022 16:37:16 -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 3A37B8721C for ; Fri, 15 Jul 2022 13:37:15 -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 1oCS3Z-0004u2-Sr; Fri, 15 Jul 2022 22:37:01 +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 1oCS3Z-001BFu-4w; Fri, 15 Jul 2022 22:37:01 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oCS3Y-005PyZ-3F; Fri, 15 Jul 2022 22:37:00 +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 8/8] interconnect: imx: Make imx_icc_unregister() return void Date: Fri, 15 Jul 2022 22:36:52 +0200 Message-Id: <20220715203652.89912-9-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220715203652.89912-1-u.kleine-koenig@pengutronix.de> References: <20220715203652.89912-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/pANAwAKAcH8FHityuwJAcsmYgBi0c+s0VFV3l2yU6+MVs4rL1Au6U6sq+5+aOG/8TLT qP+54gSJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtHPrAAKCRDB/BR4rcrsCZtiB/ 9expsimli0HRq4gZeoNwXXHWa4FF8Vi+Gx33WCUGQSEO0uNn7xgHpwXJ+/OdUZHxEHtd91a/z8b6tp FokDkOWE43yZytFeV/ijQtsrKu0WWxqMjcNCrZYhFapYNwk0Qe3IKHexvcnLRcyuqc0BT5gMjv1jzI zt3OI5iATd75X93YPw/JRLHESRzvHkbZw5gTeQA5N2NE+Z1BpFZGFp1rSYQNaaQoJatKsThWL+U6OY 0Yleds6GaTdRLpIlBRszfuCDQSo2H5dQvK6TSaWuYqztHVh4NViL3/98u8C2ruw3Arxg1Pa/T/GXgc erOvv92Vkx41h9uTWkqj34Xwq2Nz8G 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 = {