From patchwork Sun Mar 12 16:15:03 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: 68389 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp792967wrd; Sun, 12 Mar 2023 09:45:51 -0700 (PDT) X-Google-Smtp-Source: AK7set/dafeN/V4Dcwf6c/QvPPDfPciOsFFyh9YzPRiLdhyhazoF54ENkcwV8I2Tj+3jPpFiwqHv X-Received: by 2002:a05:6a20:440c:b0:ce:5c14:2838 with SMTP id ce12-20020a056a20440c00b000ce5c142838mr43646506pzb.54.1678639550870; Sun, 12 Mar 2023 09:45:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678639550; cv=none; d=google.com; s=arc-20160816; b=ACH6gizfgJT8lJa2zUZ5QRSpaaIDL7u4V37VmUCNA1ed8AI50xktpEdh51EGVoOJmO y5ip/SuFKH2MAMkByzcDKYFu1qGs5syy0OZu/hamr0ZU7qyU/j5H/xt557r7yMKRVo77 +vhVn5/r9b8G7PQ3vVQwGx98YkqeIEiMExBW+ngZVIj4M7EBh7Q6XPoH2OVG5h7xdj4F ma10sCnefNviXitxtGFsPxUvS/HivObtYxGMM4IPesx8idpnoYhBL5k/lUAEvNYCeZ69 aF3vpJggNL3+ACyvweKx8RJa8Zx3RHWiqMz5nzyQJlCEtbO0AkyAl5vgu6t3fcfYOHVZ Bzow== 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=A12U4wlbS83PC9dG8Vtsly/WW7y9h9bKThCrzgPhp3Y=; b=F6UE5w6Du0Z9JpMszDY0ilM0ReUyCPkHTwWUECBQ07EBN7XPrBpdo2iYPcZ33Is98p 8QV6xjV/V3pFKQv1HpUNrulMOegOR4Q22FwkBfpjpiCWcYKQ0X5G7YI2EreNVdcYe9mz RK7hd0usqGEHQEsJiUb9j4KHd2+vACvVjT5KEGx7/bgcB0yswfa68bk76hKqlVHz+EHE QXOs1bpQnMJQ3kL3CiqJ9moUc2clHr50kH/fcS2y6v0Rc6CXZFpprDkvct5q9rKRcu3U sYNOSOYCrSfb5xde0/TZNfm0Wr05woxJp5Znu2uh1LnrcT+T0wcZXorvXobI8BeuWFJn S+0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q12-20020a63cc4c000000b005074cff89c7si140391pgi.421.2023.03.12.09.45.31; Sun, 12 Mar 2023 09:45:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230085AbjCLQQP (ORCPT + 99 others); Sun, 12 Mar 2023 12:16:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230131AbjCLQPb (ORCPT ); Sun, 12 Mar 2023 12:15: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 E649C34F6E for ; Sun, 12 Mar 2023 09:15:29 -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 1pbOM0-0007rH-Eb; Sun, 12 Mar 2023 17:15:24 +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 1pbOLz-003f36-Pq; Sun, 12 Mar 2023 17:15:23 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pbOLy-004K9J-MT; Sun, 12 Mar 2023 17:15:22 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Michael Turquette , Stephen Boyd Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 21/30] clk: mvebu: Convert to platform remove callback returning void Date: Sun, 12 Mar 2023 17:15:03 +0100 Message-Id: <20230312161512.2715500-22-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230312161512.2715500-1-u.kleine-koenig@pengutronix.de> References: <20230312161512.2715500-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4390; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=WMTwTZXP8LdhrTppykw/Ey9Tf4bxrgjWhSEjSmPYxu0=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBkDfprZ5YALT/w10X6upwax85uZRgogh4gB5pws JwhwUrbucCJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCZA36awAKCRDB/BR4rcrs CWGRB/9X/lsRLoDOmA5j0fmrys8M6tXFOu0ftVULR4UklyTtE5PMdX/75F3LsWHgYppPgTAO+x7 vyPoy2/6ILVI0lb9u8MijUQa2Ozu+CJy9LzCdd/Gg81WRr2xrSoTL9LFS3TgTesuYz/Hi+1FwPD pkZs/88UVShdVeubuI+RM/vXzDM1DK8Ondr6ixD60x1ek+3izG/nP6oNHe4sV8O1MlI0zbp/rhF Z9EsSnw0/1aD74FSeB5TV1VtFF3+uRu7O4N3OJ2q63VEA9sXRKYlEKFzQjITIBirGiDfmH/X5IO lsklLlU+ei0APGgYylYNbWUdZjTzNU27OUlpG8ul/pc5hjrh 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-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760181145754383264?= X-GMAIL-MSGID: =?utf-8?q?1760181145754383264?= 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/clk/mvebu/armada-37xx-periph.c | 6 ++---- drivers/clk/mvebu/armada-37xx-tbg.c | 6 ++---- drivers/clk/mvebu/armada-37xx-xtal.c | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c index e3777ca65912..3ae6078f6ff7 100644 --- a/drivers/clk/mvebu/armada-37xx-periph.c +++ b/drivers/clk/mvebu/armada-37xx-periph.c @@ -781,7 +781,7 @@ static int armada_3700_periph_clock_probe(struct platform_device *pdev) return 0; } -static int armada_3700_periph_clock_remove(struct platform_device *pdev) +static void armada_3700_periph_clock_remove(struct platform_device *pdev) { struct clk_periph_driver_data *data = platform_get_drvdata(pdev); struct clk_hw_onecell_data *hw_data = data->hw_data; @@ -791,13 +791,11 @@ static int armada_3700_periph_clock_remove(struct platform_device *pdev) for (i = 0; i < hw_data->num; i++) clk_hw_unregister(hw_data->hws[i]); - - return 0; } static struct platform_driver armada_3700_periph_clock_driver = { .probe = armada_3700_periph_clock_probe, - .remove = armada_3700_periph_clock_remove, + .remove_new = armada_3700_periph_clock_remove, .driver = { .name = "marvell-armada-3700-periph-clock", .of_match_table = armada_3700_periph_clock_of_match, diff --git a/drivers/clk/mvebu/armada-37xx-tbg.c b/drivers/clk/mvebu/armada-37xx-tbg.c index fc403ad735ad..eccc1aeefbaf 100644 --- a/drivers/clk/mvebu/armada-37xx-tbg.c +++ b/drivers/clk/mvebu/armada-37xx-tbg.c @@ -126,7 +126,7 @@ static int armada_3700_tbg_clock_probe(struct platform_device *pdev) return of_clk_add_hw_provider(np, of_clk_hw_onecell_get, hw_tbg_data); } -static int armada_3700_tbg_clock_remove(struct platform_device *pdev) +static void armada_3700_tbg_clock_remove(struct platform_device *pdev) { int i; struct clk_hw_onecell_data *hw_tbg_data = platform_get_drvdata(pdev); @@ -134,8 +134,6 @@ static int armada_3700_tbg_clock_remove(struct platform_device *pdev) of_clk_del_provider(pdev->dev.of_node); for (i = 0; i < hw_tbg_data->num; i++) clk_hw_unregister_fixed_factor(hw_tbg_data->hws[i]); - - return 0; } static const struct of_device_id armada_3700_tbg_clock_of_match[] = { @@ -145,7 +143,7 @@ static const struct of_device_id armada_3700_tbg_clock_of_match[] = { static struct platform_driver armada_3700_tbg_clock_driver = { .probe = armada_3700_tbg_clock_probe, - .remove = armada_3700_tbg_clock_remove, + .remove_new = armada_3700_tbg_clock_remove, .driver = { .name = "marvell-armada-3700-tbg-clock", .of_match_table = armada_3700_tbg_clock_of_match, diff --git a/drivers/clk/mvebu/armada-37xx-xtal.c b/drivers/clk/mvebu/armada-37xx-xtal.c index 41271351cf1f..0e2e7d00ae11 100644 --- a/drivers/clk/mvebu/armada-37xx-xtal.c +++ b/drivers/clk/mvebu/armada-37xx-xtal.c @@ -65,11 +65,9 @@ static int armada_3700_xtal_clock_probe(struct platform_device *pdev) return ret; } -static int armada_3700_xtal_clock_remove(struct platform_device *pdev) +static void armada_3700_xtal_clock_remove(struct platform_device *pdev) { of_clk_del_provider(pdev->dev.of_node); - - return 0; } static const struct of_device_id armada_3700_xtal_clock_of_match[] = { @@ -79,7 +77,7 @@ static const struct of_device_id armada_3700_xtal_clock_of_match[] = { static struct platform_driver armada_3700_xtal_clock_driver = { .probe = armada_3700_xtal_clock_probe, - .remove = armada_3700_xtal_clock_remove, + .remove_new = armada_3700_xtal_clock_remove, .driver = { .name = "marvell-armada-3700-xtal-clock", .of_match_table = armada_3700_xtal_clock_of_match,