From patchwork Mon Sep 18 19:51:00 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: 141540 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2914745vqi; Mon, 18 Sep 2023 12:55:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGT4h/uOreuwahWqByEKl/ZZa97zReAwvcDXMrLah5RiwPfpFYLicbL+L913HMzjv5wzFz7 X-Received: by 2002:a17:902:d491:b0:1c3:e3b1:98df with SMTP id c17-20020a170902d49100b001c3e3b198dfmr10807508plg.52.1695066916525; Mon, 18 Sep 2023 12:55:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695066916; cv=none; d=google.com; s=arc-20160816; b=SbxGu/nq3/HszcKCWC7+hr6m/Zq7tglOnHmdRYMg1O3hGO2Fl+iYgRjvzcc188mTKZ 82afiYnRscj3ZghdrW0oSoHD/V9QGG8azVu23+uR+7Qq/M3EOGu0/g7OOSW6yk+dG0zN ETbF+1/9tx8XosKy/JFI0TLNLCSMwLnGPylvFvK+S/rdxM5EtCUzQqXk+snDO+xIjDPc xfUAvfCOzMCSySKsyf9UPwD7kwkDwE2j3t4zUf54qua9yi06O3BYbau4V0MhPoR8S0TT HMhkEZbpPUp9H+vbBNQCvGRqfj3YJqGkSCmprIMyGmjWDeVytBSWMR4qzUOMGJDa2HpT 7/qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=WuN3B9R15Q3Zd/nIo5fJNG+ufWo57N3aUad0JKt9D3M=; fh=2LoUldgIftbCGGYNlIKiEffIWCdRcQL9EB8MUfMGcWk=; b=Wt9E2y71mf5QHgAtwM7oCRZjfKrOsGXONnCYFp4a1V7txSPIkodTtedlZYx3gPITiR xKs4KP19uJL8AUtsb93LoYAXoPzP4/6ptYuCx3ET7XGVir11kVgAB//OINGSoMFYEbRa OMIDRg2aJGLnX3u+gsX46teDZ5Gaz79nHNcQ5f/zG1rs9gAxFN8MKctBSgnBkWMf+SR3 WkeHThCdgesVzp5hzYQj+KyIRmC/KgT8lBJjBOcj3EsUjtYA3YE/eKxwVWXGUE6rGBDt MNXoM9ENMr/9NULaTyy7vV/cha+LAoA3HwPFVvgv+Sd5FDZpRKVoXYKCo9TOnzhmVMjG dKWw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id m18-20020a170902db1200b001c474ff2fdesi3298856plx.378.2023.09.18.12.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 12:55:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id C17D2823578D; Mon, 18 Sep 2023 12:53:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229904AbjIRTwN (ORCPT + 25 others); Mon, 18 Sep 2023 15:52:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229794AbjIRTvn (ORCPT ); Mon, 18 Sep 2023 15:51:43 -0400 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [IPv6:2a0a:edc0:2:b01:1d::104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89E0613A for ; Mon, 18 Sep 2023 12:51:36 -0700 (PDT) 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 1qiKHB-0003uR-K7; Mon, 18 Sep 2023 21:51:21 +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 1qiKHB-007I9Q-38; Mon, 18 Sep 2023 21:51:21 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qiKHA-002mD4-Pk; Mon, 18 Sep 2023 21:51:20 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Andrew Lunn , Heiner Kallweit Cc: Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 17/19] net: mdio: octeon: Convert to platform remove callback returning void Date: Mon, 18 Sep 2023 21:51:00 +0200 Message-Id: <20230918195102.1302746-18-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230918195102.1302746-1-u.kleine-koenig@pengutronix.de> References: <20230918195102.1302746-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1922; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=JgSJpI+VgVasj2hx9BfwfaykoqbFS61hnmgshTkmMks=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlCKoTbUB4KBW9aATzEPLdw6uEFKPaCItJVlsBH o736L7smEWJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZQiqEwAKCRCPgPtYfRL+ ToxUCACIr1RfOW1GF5asJluuxSIZo6fSkOMkZ3BXImWLOugohvvLL33TVjHornpg87S3BXmJf/e sbn51ri7AsGXTVCZHlaXIWm+cDeTOTAztOQpYQ+P7G480pbnehIJn9B2dUpoOvhoW8lcChX3GsY 7SjpY19IK0rSNlou3Qq8vhPB2pR/CgPWEdm5Zt25BEQF9S6a3L/Z050S41TPcyR2GV+FAF31jbC 2zIaPsZ534nbQcz/M3niwn7OeEmkuR1avl4IJWi2RW+mgtoYqJGK2zy0EbKcTijAmkvLF/0ThFf a6kf9+TrzLUS92Fc0/FX8qIZS+QVXQBCupb9JDto/aAb4Je9 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-kernel@vger.kernel.org X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 18 Sep 2023 12:53:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777406487067812155 X-GMAIL-MSGID: 1777406487067812155 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 this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König --- drivers/net/mdio/mdio-octeon.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/mdio/mdio-octeon.c b/drivers/net/mdio/mdio-octeon.c index 7c65c547d377..037a38cfed56 100644 --- a/drivers/net/mdio/mdio-octeon.c +++ b/drivers/net/mdio/mdio-octeon.c @@ -78,7 +78,7 @@ static int octeon_mdiobus_probe(struct platform_device *pdev) return err; } -static int octeon_mdiobus_remove(struct platform_device *pdev) +static void octeon_mdiobus_remove(struct platform_device *pdev) { struct cavium_mdiobus *bus; union cvmx_smix_en smi_en; @@ -88,7 +88,6 @@ static int octeon_mdiobus_remove(struct platform_device *pdev) mdiobus_unregister(bus->mii_bus); smi_en.u64 = 0; oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); - return 0; } static const struct of_device_id octeon_mdiobus_match[] = { @@ -105,7 +104,7 @@ static struct platform_driver octeon_mdiobus_driver = { .of_match_table = octeon_mdiobus_match, }, .probe = octeon_mdiobus_probe, - .remove = octeon_mdiobus_remove, + .remove_new = octeon_mdiobus_remove, }; module_platform_driver(octeon_mdiobus_driver);