From patchwork Wed Jan 31 18:09:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10194419 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6449A603EE for ; Wed, 31 Jan 2018 18:15:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46ACC283CA for ; Wed, 31 Jan 2018 18:15:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AFD02847E; Wed, 31 Jan 2018 18:15:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD373283CA for ; Wed, 31 Jan 2018 18:15:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753648AbeAaSPn (ORCPT ); Wed, 31 Jan 2018 13:15:43 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:35222 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753480AbeAaSJw (ORCPT ); Wed, 31 Jan 2018 13:09:52 -0500 Received: by mail-wr0-f194.google.com with SMTP id w50so16033533wrc.2 for ; Wed, 31 Jan 2018 10:09:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kg4knKPYuyfm2wSCNCd9l37IBCqO4HHAqckRn+WQIUk=; b=jhybDWDjdCIHsdRD9Fa5MSEf0qFm92v5rggsoHriizjxQUmgY3VrZk6sABt08PNAV6 l2l3xcbv1/SqOrxaRD3O4XOGPmFtRDh826Me8gPyWeZ9biqZmesa9aL72IwW8yyiB13X b912640PXIBn/RI3xQGrGwm9U1Q9GAgpJdA5lqiNl4GnJR7DoHJtRaHFUrcsQhsN6Cbe zjdptL0BMRIxjARuqR8KubmKjycMmF2IGCCcnGDGN6jcjHBtJKzFeeMeSk61QjChixkV FHfntU/Ya5rAD+1VtrF4y1S38+lwoKvmxN1rPGCiOr/briyFfumlrfn2+m7remfabAYX 4csg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kg4knKPYuyfm2wSCNCd9l37IBCqO4HHAqckRn+WQIUk=; b=GMwMgdaq0D6rvKm+nZCMSb/32diD3rf0g75wpHf+kEy3c3+6FNe3+GOx22mLlwsYye 9umdKa01UGuDfFsPGtx3nk8h7xg/NddtnUTCJeKjeY3wuFqhCondaEgSfXhjFymoQ1mA dQ+G9plYMdOZf0HFp3GQ7KNjKmRQ8oNFWNaVlE4yLWC7QREFkOugCSdo6pmUuWwU6SeF LgYS0cyEEz5EP9jBJvZnJ7XWDin10vZX9i6BmkapF4PXsWD5fpxdsJnH9i6SJu3zdeCA obmPk5yP+qcwWzaV+UPSEERhkaLODj5tWHyenFo3RmLTPa8mTsAaVlJChf2vY+gMD/28 /XJw== X-Gm-Message-State: AKwxytdIvH4qUWxznUGdaO8zP8EdxmWhtbNkNqQH+Y6z96l85ZKUXd93 3oWVOJk/lt9saml2ZETsLMjtYA== X-Google-Smtp-Source: AH8x226fBzDWlEGnrCMT2JHGF6Psg0FnKlNOgqg0WcFyTPMTpxVVTrkOodxUkwpl6TufybUngfyx5g== X-Received: by 10.223.187.20 with SMTP id r20mr29144564wrg.115.1517422191687; Wed, 31 Jan 2018 10:09:51 -0800 (PST) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id f8sm341977wmc.3.2018.01.31.10.09.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Jan 2018 10:09:51 -0800 (PST) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman Cc: Jerome Brunet , Stephen Boyd , Michael Turquette , Carlo Caione , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/19] clk: meson: use devm_of_clk_add_hw_provider Date: Wed, 31 Jan 2018 19:09:28 +0100 Message-Id: <20180131180945.18025-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180131180945.18025-1-jbrunet@baylibre.com> References: <20180131180945.18025-1-jbrunet@baylibre.com> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is no remove callbacks in meson's clock controllers and of_clk_del_provider is never called if of_clk_add_hw_provider has been executed, introducing a potential memory leak. Fixing this by the using the devm variant. In reality, the leak would never happen since these controllers are never unloaded once in use ... still, this is worth cleaning. Signed-off-by: Jerome Brunet --- drivers/clk/meson/axg.c | 4 ++-- drivers/clk/meson/gxbb.c | 5 +++-- drivers/clk/meson/meson8b.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index 0db0fc0762e2..2f2b3845c01d 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -854,8 +854,8 @@ static int axg_clkc_probe(struct platform_device *pdev) } } - return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get, - clkc_data->hw_onecell_data); + return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, + clkc_data->hw_onecell_data); } static struct platform_driver axg_driver = { diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 423abcb8ef88..17f44ac751b3 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -2002,8 +2002,9 @@ static int gxbb_clkc_probe(struct platform_device *pdev) goto iounmap; } - return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get, - clkc_data->hw_onecell_data); + + return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, + clkc_data->hw_onecell_data); iounmap: iounmap(clk_base); diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c index 3ffea80c1308..abac079ff77f 100644 --- a/drivers/clk/meson/meson8b.c +++ b/drivers/clk/meson/meson8b.c @@ -878,8 +878,8 @@ static int meson8b_clkc_probe(struct platform_device *pdev) return ret; } - return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get, - &meson8b_hw_onecell_data); + return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, + &meson8b_hw_onecell_data); } static const struct of_device_id meson8b_clkc_match_table[] = {