From patchwork Tue Mar 21 15:40:37 2023 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: 13182877 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 776B6C7619A for ; Tue, 21 Mar 2023 15:41:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231590AbjCUPlC (ORCPT ); Tue, 21 Mar 2023 11:41:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231270AbjCUPlB (ORCPT ); Tue, 21 Mar 2023 11:41:01 -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 76139DBE0 for ; Tue, 21 Mar 2023 08:40:51 -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 1pee6O-0003FY-NF; Tue, 21 Mar 2023 16:40:44 +0100 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 1pee6O-005iqH-3D; Tue, 21 Mar 2023 16:40:44 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pee6N-006nea-B2; Tue, 21 Mar 2023 16:40:43 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Andy Gross , Bjorn Andersson , Mathieu Poirier Cc: Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 1/3] rpmsg: qcom_smd: Make qcom_smd_unregister_edge() return void Date: Tue, 21 Mar 2023 16:40:37 +0100 Message-Id: <20230321154039.355098-2-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230321154039.355098-1-u.kleine-koenig@pengutronix.de> References: <20230321154039.355098-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2308; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=5XdQzZ0R90F8m3PN1OM+KsPXM1lJB+4lb0RFEzu1plo=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBkGc/yaS3zmOMxxC1JTQiL/wIhkNo3HjSGJY+3a 0Oz/sSufcaJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZBnP8gAKCRCPgPtYfRL+ TvHFB/4gCLQyyqmKiO0a/fzwN6Zeah5tVdOVeLjQMT2KQhjyahcWuWRt3IRrkKjDlkpFg5qVIWz DvU22vcZ/+kMnkWE27rnos7L4CZvYlrZdpN9yUc+/exCifx1TiBEaMUV+rZ6G3CAcaxSOjBKG/r SQvbjVNzrAnb6AxHNJS8qS4MiKxfeJYG/BtPcLkyEcrffqAzBSW3kQDZgKIireIermpYrwS+Jd1 kC3Ig4NpkpBbL316sSe6KOPWj6reCyEhtOnGLt/KFvP1xDuKhW2XernBxYbRs+6WUqU82daVCEo JMTe8yiOAPSw3XJX0OYu7xwu6PPv8ThnFKeVz0vApDsCY9PI 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-arm-msm@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This function returned zero unconditionally. Convert it to return no value instead. This makes it more obvious what happens in the callers. One caller is converted to return zero explicitly. The only other caller (smd_subdev_stop() in drivers/remoteproc/qcom_common.c) already ignored the return value before. Signed-off-by: Uwe Kleine-König --- drivers/rpmsg/qcom_smd.c | 8 ++++---- include/linux/rpmsg/qcom_smd.h | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c index 1044cf03c542..38352f5792f4 100644 --- a/drivers/rpmsg/qcom_smd.c +++ b/drivers/rpmsg/qcom_smd.c @@ -1533,7 +1533,7 @@ static int qcom_smd_remove_device(struct device *dev, void *data) * qcom_smd_unregister_edge() - release an edge and its children * @edge: edge reference acquired from qcom_smd_register_edge */ -int qcom_smd_unregister_edge(struct qcom_smd_edge *edge) +void qcom_smd_unregister_edge(struct qcom_smd_edge *edge) { int ret; @@ -1547,8 +1547,6 @@ int qcom_smd_unregister_edge(struct qcom_smd_edge *edge) mbox_free_channel(edge->mbox_chan); device_unregister(&edge->dev); - - return 0; } EXPORT_SYMBOL(qcom_smd_unregister_edge); @@ -1572,7 +1570,9 @@ static int qcom_smd_remove_edge(struct device *dev, void *data) { struct qcom_smd_edge *edge = to_smd_edge(dev); - return qcom_smd_unregister_edge(edge); + qcom_smd_unregister_edge(edge); + + return 0; } /* diff --git a/include/linux/rpmsg/qcom_smd.h b/include/linux/rpmsg/qcom_smd.h index 2e92d7407a85..3379bf4e1cb1 100644 --- a/include/linux/rpmsg/qcom_smd.h +++ b/include/linux/rpmsg/qcom_smd.h @@ -11,7 +11,7 @@ struct qcom_smd_edge; struct qcom_smd_edge *qcom_smd_register_edge(struct device *parent, struct device_node *node); -int qcom_smd_unregister_edge(struct qcom_smd_edge *edge); +void qcom_smd_unregister_edge(struct qcom_smd_edge *edge); #else @@ -22,9 +22,8 @@ qcom_smd_register_edge(struct device *parent, return NULL; } -static inline int qcom_smd_unregister_edge(struct qcom_smd_edge *edge) +static inline void qcom_smd_unregister_edge(struct qcom_smd_edge *edge) { - return 0; } #endif From patchwork Tue Mar 21 15:40:38 2023 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: 13182879 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 B5692C6FD1D for ; Tue, 21 Mar 2023 15:41:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230329AbjCUPlC (ORCPT ); Tue, 21 Mar 2023 11:41:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231326AbjCUPlB (ORCPT ); Tue, 21 Mar 2023 11:41:01 -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 7B58DEC43 for ; Tue, 21 Mar 2023 08:40:51 -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 1pee6O-0003Fc-Tv; Tue, 21 Mar 2023 16:40:44 +0100 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 1pee6O-005iqK-8z; Tue, 21 Mar 2023 16:40:44 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pee6N-006ned-I6; Tue, 21 Mar 2023 16:40:43 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Andy Gross , Bjorn Andersson , Mathieu Poirier Cc: Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 2/3] rpmsg: qcom_glink_rpm: Convert to platform remove callback returning void Date: Tue, 21 Mar 2023 16:40:38 +0100 Message-Id: <20230321154039.355098-3-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230321154039.355098-1-u.kleine-koenig@pengutronix.de> References: <20230321154039.355098-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1803; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=6lj3vlyNinDoNTo4QZwyTeJ7afyM68ayWd/4RXMK5yQ=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBkGc/z6Dh2K3UyhZxLpzqSp/Hnnh9G3yGVLlnPu 95XHfx4ZNGJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZBnP8wAKCRCPgPtYfRL+ TlpGCACqTRlnylgQPlRehsNoN8is2AwcF1J/7UoD6UJ07PVE89+roVmaIZ062H5zCcULQJYSEzx SxjxBGtQ7q5CLvE1spK5X+YNAvi3kOEM4XaNGHUCv0M2yh35J3KbgwG6pveVma2A1pl7FCiD/2z hOVfRY6etcY0toj1veuinq0m6AXLIl2pmYvAuvbEBMBXRTqvYqKqKRiV/yN9leo3CmIl2E1i6B7 2VCGFr0QLJ3w/ceRjrG7BgKg48vG8knqmvNAkCFpSdAJpsYkf3I1iEji83+G3Oql6MIelR7TKso 5/t3spLf+b4nnl9cqBT3uGZnsiwsXW4TsaDVFlJZfEInuJd4 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-arm-msm@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is (mostly) ignored and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new() which already returns void. Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König --- drivers/rpmsg/qcom_glink_rpm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/rpmsg/qcom_glink_rpm.c b/drivers/rpmsg/qcom_glink_rpm.c index f94bb7d4f1ec..357272d7062e 100644 --- a/drivers/rpmsg/qcom_glink_rpm.c +++ b/drivers/rpmsg/qcom_glink_rpm.c @@ -361,7 +361,7 @@ static int glink_rpm_probe(struct platform_device *pdev) return 0; } -static int glink_rpm_remove(struct platform_device *pdev) +static void glink_rpm_remove(struct platform_device *pdev) { struct glink_rpm *rpm = platform_get_drvdata(pdev); struct qcom_glink *glink = rpm->glink; @@ -371,8 +371,6 @@ static int glink_rpm_remove(struct platform_device *pdev) qcom_glink_native_remove(glink); mbox_free_channel(rpm->mbox_chan); - - return 0; } static const struct of_device_id glink_rpm_of_match[] = { @@ -383,7 +381,7 @@ MODULE_DEVICE_TABLE(of, glink_rpm_of_match); static struct platform_driver glink_rpm_driver = { .probe = glink_rpm_probe, - .remove = glink_rpm_remove, + .remove_new = glink_rpm_remove, .driver = { .name = "qcom_glink_rpm", .of_match_table = glink_rpm_of_match, From patchwork Tue Mar 21 15:40:39 2023 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: 13182880 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 A267EC761AF for ; Tue, 21 Mar 2023 15:41:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231681AbjCUPlD (ORCPT ); Tue, 21 Mar 2023 11:41:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231487AbjCUPlC (ORCPT ); Tue, 21 Mar 2023 11:41:02 -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 40F039EC0 for ; Tue, 21 Mar 2023 08:40:52 -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 1pee6P-0003Fi-2C; Tue, 21 Mar 2023 16:40:45 +0100 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 1pee6O-005iqN-Dh; Tue, 21 Mar 2023 16:40:44 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pee6N-006neg-Ow; Tue, 21 Mar 2023 16:40:43 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Andy Gross , Bjorn Andersson , Mathieu Poirier Cc: Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 3/3] rpmsg: qcom_smd: Convert to platform remove callback returning void Date: Tue, 21 Mar 2023 16:40:39 +0100 Message-Id: <20230321154039.355098-4-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230321154039.355098-1-u.kleine-koenig@pengutronix.de> References: <20230321154039.355098-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2074; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=vfP+6zhvD7kjimlQb22nCx08X9KwzGWQAEQx2IhXimk=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBkGc/1+KJIkhAk3rRv1A43kavA2Wz57kw8+MGKD KfKIuYWM5CJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZBnP9QAKCRCPgPtYfRL+ TjTzB/97fSHtcCeTzilW09t7bjpdrUhPzH56lwctf5C5ZqqU9j5hsyyXJbHJUmXLp7RIUn8pHg2 KLsz4U2O1zW0Zy8LMy+S0QI0Py3K07mXX9e2alCXTAb22/eiVd+En7JIQpp/tuhnVcYtxHkUewz ey4ohNl27HsxuOGspLuNl/m9D55vjcs4utQUhbR8D5pqUP5H3G0kCSQUMVU1DM+Bs/bCNSH24vM PfuaSARxSX7PzV852+Ljgb5rAXuj33nagCyHJa6t4mJXd0whALD0xRegV0I3PLGWqs0X1YtAUdQ K1MnRK60LMiGHI4dUWvj2r9Az4OtbehaGIISD6pyCESr0wSZ 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-arm-msm@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is (mostly) ignored and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new() which already returns void. qcom_smd_remove() always returned zero, though that isn't completely trivial to see. So explain that in a comment and convert to .remove_new(). Signed-off-by: Uwe Kleine-König --- drivers/rpmsg/qcom_smd.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c index 38352f5792f4..7b9c298aa491 100644 --- a/drivers/rpmsg/qcom_smd.c +++ b/drivers/rpmsg/qcom_smd.c @@ -1579,15 +1579,13 @@ static int qcom_smd_remove_edge(struct device *dev, void *data) * Shut down all smd clients by making sure that each edge stops processing * events and scanning for new channels, then call destroy on the devices. */ -static int qcom_smd_remove(struct platform_device *pdev) +static void qcom_smd_remove(struct platform_device *pdev) { - int ret; - - ret = device_for_each_child(&pdev->dev, NULL, qcom_smd_remove_edge); - if (ret) - dev_warn(&pdev->dev, "can't remove smd device: %d\n", ret); - - return ret; + /* + * qcom_smd_remove_edge always returns zero, so there is no need to + * check the return value of device_for_each_child. + */ + device_for_each_child(&pdev->dev, NULL, qcom_smd_remove_edge); } static const struct of_device_id qcom_smd_of_match[] = { @@ -1598,7 +1596,7 @@ MODULE_DEVICE_TABLE(of, qcom_smd_of_match); static struct platform_driver qcom_smd_driver = { .probe = qcom_smd_probe, - .remove = qcom_smd_remove, + .remove_new = qcom_smd_remove, .driver = { .name = "qcom-smd", .of_match_table = qcom_smd_of_match,