From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66090C433DB for ; Mon, 29 Mar 2021 21:56:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 375F260295 for ; Mon, 29 Mar 2021 21:56:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230362AbhC2Vzw (ORCPT ); Mon, 29 Mar 2021 17:55:52 -0400 Received: from m43-7.mailgun.net ([69.72.43.7]:55451 "EHLO m43-7.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231421AbhC2VzY (ORCPT ); Mon, 29 Mar 2021 17:55:24 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1617054924; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=335V7rJ+Y2NdV4wGUVCcawe7h/FTEkG0olXdzWQzh6s=; b=sljOMxrNR7tuSTYzq6qRLNMeYh/QH2KmhZPdEBXftQQGw33txL0O6yLARrqUtUudruDsPL/W 8myxaqhgJj7oaiIqKq4Pv1dqM6pBWSPCC550Et5zvt2mJi3wHY0XwOlazv08h+xPxuu8tcTQ GTvxTKjJePaboQZgUfGNknvcsWU= X-Mailgun-Sending-Ip: 69.72.43.7 X-Mailgun-Sid: WyI1MzIzYiIsICJsaW51eC1hcm0tbXNtQHZnZXIua2VybmVsLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n05.prod.us-west-2.postgun.com with SMTP id 60624cbd3f0cbfdaf2e71e79 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 29 Mar 2021 21:55:09 GMT Sender: abhinavk=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 1E19AC43462; Mon, 29 Mar 2021 21:55:09 +0000 (UTC) Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: abhinavk) by smtp.codeaurora.org (Postfix) with ESMTPSA id B0545C433CA; Mon, 29 Mar 2021 21:55:07 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Mon, 29 Mar 2021 14:55:07 -0700 From: abhinavk@codeaurora.org To: Dmitry Baryshkov Cc: Rob Clark , Sean Paul , Jonathan Marek , Michael Turquette , Stephen Boyd , linux-arm-msm@vger.kernel.org, Daniel Palmer , dri-devel@lists.freedesktop.org, David Airlie , freedreno@lists.freedesktop.org, linux-clk@vger.kernel.org Subject: Re: [PATCH v3 01/25] clk: fixed: add devm helper for clk_hw_register_fixed_factor() In-Reply-To: <20210327110305.3289784-2-dmitry.baryshkov@linaro.org> References: <20210327110305.3289784-1-dmitry.baryshkov@linaro.org> <20210327110305.3289784-2-dmitry.baryshkov@linaro.org> Message-ID: <1f62eb178bb36111801521de6eeddad1@codeaurora.org> X-Sender: abhinavk@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 2021-03-27 04:02, Dmitry Baryshkov wrote: > From: Daniel Palmer > > Add a devm helper for clk_hw_register_fixed_factor() so that drivers > that internally > register fixed factor clocks for things like dividers don't need to > manually unregister > them on remove or if probe fails. > > Signed-off-by: Daniel Palmer > Link: > https://lore.kernel.org/r/20210211052206.2955988-4-daniel@0x0f.com > Signed-off-by: Stephen Boyd > Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar > --- > drivers/clk/clk-fixed-factor.c | 39 ++++++++++++++++++++++++++++------ > include/linux/clk-provider.h | 4 +++- > 2 files changed, 36 insertions(+), 7 deletions(-) > > diff --git a/drivers/clk/clk-fixed-factor.c > b/drivers/clk/clk-fixed-factor.c > index 910e6e74ae90..4f7bf3929d6d 100644 > --- a/drivers/clk/clk-fixed-factor.c > +++ b/drivers/clk/clk-fixed-factor.c > @@ -64,10 +64,16 @@ const struct clk_ops clk_fixed_factor_ops = { > }; > EXPORT_SYMBOL_GPL(clk_fixed_factor_ops); > > +static void devm_clk_hw_register_fixed_factor_release(struct device > *dev, void *res) > +{ > + clk_hw_unregister_fixed_factor(&((struct clk_fixed_factor > *)res)->hw); > +} > + > static struct clk_hw * > __clk_hw_register_fixed_factor(struct device *dev, struct device_node > *np, > const char *name, const char *parent_name, int index, > - unsigned long flags, unsigned int mult, unsigned int div) > + unsigned long flags, unsigned int mult, unsigned int div, > + bool devm) > { > struct clk_fixed_factor *fix; > struct clk_init_data init = { }; > @@ -75,7 +81,15 @@ __clk_hw_register_fixed_factor(struct device *dev, > struct device_node *np, > struct clk_hw *hw; > int ret; > > - fix = kmalloc(sizeof(*fix), GFP_KERNEL); > + /* You can't use devm without a dev */ > + if (devm && !dev) > + return ERR_PTR(-EINVAL); > + > + if (devm) > + fix = devres_alloc(devm_clk_hw_register_fixed_factor_release, > + sizeof(*fix), GFP_KERNEL); > + else > + fix = kmalloc(sizeof(*fix), GFP_KERNEL); > if (!fix) > return ERR_PTR(-ENOMEM); > > @@ -99,9 +113,13 @@ __clk_hw_register_fixed_factor(struct device *dev, > struct device_node *np, > else > ret = of_clk_hw_register(np, hw); > if (ret) { > - kfree(fix); > + if (devm) > + devres_free(fix); > + else > + kfree(fix); > hw = ERR_PTR(ret); > - } > + } else if (devm) > + devres_add(dev, fix); > > return hw; > } > @@ -111,7 +129,7 @@ struct clk_hw *clk_hw_register_fixed_factor(struct > device *dev, > unsigned int mult, unsigned int div) > { > return __clk_hw_register_fixed_factor(dev, NULL, name, parent_name, > -1, > - flags, mult, div); > + flags, mult, div, false); > } > EXPORT_SYMBOL_GPL(clk_hw_register_fixed_factor); > > @@ -153,6 +171,15 @@ void clk_hw_unregister_fixed_factor(struct clk_hw > *hw) > } > EXPORT_SYMBOL_GPL(clk_hw_unregister_fixed_factor); > > +struct clk_hw *devm_clk_hw_register_fixed_factor(struct device *dev, > + const char *name, const char *parent_name, unsigned long flags, > + unsigned int mult, unsigned int div) > +{ > + return __clk_hw_register_fixed_factor(dev, NULL, name, parent_name, > -1, > + flags, mult, div, true); > +} > +EXPORT_SYMBOL_GPL(devm_clk_hw_register_fixed_factor); > + > #ifdef CONFIG_OF > static const struct of_device_id set_rate_parent_matches[] = { > { .compatible = "allwinner,sun4i-a10-pll3-2x-clk" }, > @@ -185,7 +212,7 @@ static struct clk_hw > *_of_fixed_factor_clk_setup(struct device_node *node) > flags |= CLK_SET_RATE_PARENT; > > hw = __clk_hw_register_fixed_factor(NULL, node, clk_name, NULL, 0, > - flags, mult, div); > + flags, mult, div, false); > if (IS_ERR(hw)) { > /* > * Clear OF_POPULATED flag so that clock registration can be > diff --git a/include/linux/clk-provider.h > b/include/linux/clk-provider.h > index e4316890661a..58f6fe866ae9 100644 > --- a/include/linux/clk-provider.h > +++ b/include/linux/clk-provider.h > @@ -941,7 +941,9 @@ struct clk_hw *clk_hw_register_fixed_factor(struct > device *dev, > const char *name, const char *parent_name, unsigned long flags, > unsigned int mult, unsigned int div); > void clk_hw_unregister_fixed_factor(struct clk_hw *hw); > - > +struct clk_hw *devm_clk_hw_register_fixed_factor(struct device *dev, > + const char *name, const char *parent_name, unsigned long flags, > + unsigned int mult, unsigned int div); > /** > * struct clk_fractional_divider - adjustable fractional divider clock > *