From patchwork Mon Sep 18 20:41:41 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: 13390394 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 28007C46CA1 for ; Mon, 18 Sep 2023 20:43:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EI5T7a/LQA4yAK8rejCkNORD9JWRfrsuDofUhMidx50=; b=rWVn2s29K+cMbd 0xTx73Ds79Aol40ruGrvfadB/2PoqePC4gInG75RMeKNxgmeQlKSkTOU2RPa4M4Ziq2Bam9Bv+yff Xz9csCP5nFXiYRDQ7a5BDg+QlKwXSP6zVZIpAyi0aSLqsbckEFvP0wYyp+TpFEYtlq9X/kKZjY25f HneJK2KJyQnXjVll9JtXErY3Rb7TJfWKWYvoxzwyqv3Ch8u9yHm24afy2hDgyymHf6EupxU29I2g6 pIgUI/reXkmNOVOEbrl1jrsd42tab5v2HCiBd+cCw1GhF9ww5rxIkLYv3eUCUF/G0AFQVt76Nk98f b2U3+Cj/517KRWgxBgEw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qiL5J-00GIlK-27; Mon, 18 Sep 2023 20:43:09 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qiL57-00GIgj-2e for linux-rockchip@lists.infradead.org; Mon, 18 Sep 2023 20:42:59 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qiL4n-0006ke-6G; Mon, 18 Sep 2023 22:42:37 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qiL4m-007Ii2-N0; Mon, 18 Sep 2023 22:42:36 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qiL4m-002mnm-De; Mon, 18 Sep 2023 22:42:36 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Heiko Stuebner , Simon Horman , netdev@vger.kernel.org, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH net-next 09/54] net: ethernet: arc: Convert to platform remove callback returning void Date: Mon, 18 Sep 2023 22:41:41 +0200 Message-Id: <20230918204227.1316886-10-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230918204227.1316886-1-u.kleine-koenig@pengutronix.de> References: <20230918204227.1316886-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2830; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=rYsQlnU4Zpdy+1FCQVNsYjaerpegxcHny3CbdTGErvU=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlCLXuXjW2oGENYdmI6sEhfokUmb+RNb6H0vrWP 5gcBjUooP6JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZQi17gAKCRCPgPtYfRL+ TjECB/0dP7YUtvYCnAJ7Tq9beTJ4KxL+9Om6TuE9RAKtvlRBUEq+Zs58P5xE4064WMq+77fpLLX uro2dBIaIC/dQC6YUQEGm2uN6wbMEb6rE6onpSKh0kTcmmjG0fsLa2zzvR2YP72O2Bi6ZlHQLX6 fiP37LojrVBYW8W3PtpW9qY1hqat6DH2M5dQEmbHSgnYhxYJa469AAknFTQ+IIqjBLNEcevOR8H tI0bY9PiXjUOWoKy8e+ulrGsLzK45n6adzE7ibxKHj2rwhqVEVx0+5V3ELw/4PqnHJKnokXtFAt 5NLFylv5phTtR38Tl82bpynW+BW+dcq8pozkqqhqr13U1xki 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-rockchip@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230918_134257_858886_99927B78 X-CRM114-Status: GOOD ( 16.60 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.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 ignored (apart from emitting a warning) 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. Eventually after all drivers are converted, .remove_new() is renamed to .remove(). Trivially convert these drivers from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König --- drivers/net/ethernet/arc/emac_arc.c | 6 ++---- drivers/net/ethernet/arc/emac_rockchip.c | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/arc/emac_arc.c b/drivers/net/ethernet/arc/emac_arc.c index ce3147e886a1..a3afddb23ee8 100644 --- a/drivers/net/ethernet/arc/emac_arc.c +++ b/drivers/net/ethernet/arc/emac_arc.c @@ -58,14 +58,12 @@ static int emac_arc_probe(struct platform_device *pdev) return err; } -static int emac_arc_remove(struct platform_device *pdev) +static void emac_arc_remove(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); arc_emac_remove(ndev); free_netdev(ndev); - - return 0; } static const struct of_device_id emac_arc_dt_ids[] = { @@ -76,7 +74,7 @@ MODULE_DEVICE_TABLE(of, emac_arc_dt_ids); static struct platform_driver emac_arc_driver = { .probe = emac_arc_probe, - .remove = emac_arc_remove, + .remove_new = emac_arc_remove, .driver = { .name = DRV_NAME, .of_match_table = emac_arc_dt_ids, diff --git a/drivers/net/ethernet/arc/emac_rockchip.c b/drivers/net/ethernet/arc/emac_rockchip.c index 509101112279..493d6356c8ca 100644 --- a/drivers/net/ethernet/arc/emac_rockchip.c +++ b/drivers/net/ethernet/arc/emac_rockchip.c @@ -244,7 +244,7 @@ static int emac_rockchip_probe(struct platform_device *pdev) return err; } -static int emac_rockchip_remove(struct platform_device *pdev) +static void emac_rockchip_remove(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); struct rockchip_priv_data *priv = netdev_priv(ndev); @@ -260,12 +260,11 @@ static int emac_rockchip_remove(struct platform_device *pdev) clk_disable_unprepare(priv->macclk); free_netdev(ndev); - return 0; } static struct platform_driver emac_rockchip_driver = { .probe = emac_rockchip_probe, - .remove = emac_rockchip_remove, + .remove_new = emac_rockchip_remove, .driver = { .name = DRV_NAME, .of_match_table = emac_rockchip_dt_ids,