[2/3] clk: Add devm_clk_{register,unregister}()

Commit Message

Stephen Boyd Sept. 21, 2012, 2:33 a.m. UTC

On 09/18/12 23:05, Stephen Boyd wrote:
> +void devm_clk_unregister(struct device *dev, struct clk *clk)
> +{
> +	WARN_ON(devres_destroy(dev, devm_clk_release, devm_clk_match, clk));

Hm... I guess this needs to be devres_release() instead of destroy. Can
you squash this in or should I resend for the few character change?

Comments

Mike Turquette Sept. 22, 2012, 1:07 a.m. UTC | #1

Quoting Stephen Boyd (2012-09-20 19:33:42)
> On 09/18/12 23:05, Stephen Boyd wrote:
> > +void devm_clk_unregister(struct device *dev, struct clk *clk)
> > +{
> > +     WARN_ON(devres_destroy(dev, devm_clk_release, devm_clk_match, clk));
> 
> Hm... I guess this needs to be devres_release() instead of destroy. Can
> you squash this in or should I resend for the few character change?
> 

I'm not taking any more changes for 3.7, so in the interest of me being
lazy can you resend with the fixup?

Thanks,
Mike

> diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
> index 6852809..f02f4fe 100644
> --- a/drivers/clk/clk.c
> +++ b/drivers/clk/clk.c
> @@ -1509,7 +1509,7 @@ static int devm_clk_match(struct device *dev, void *res, void *data)
>   */
>  void devm_clk_unregister(struct device *dev, struct clk *clk)
>  {
> -       WARN_ON(devres_destroy(dev, devm_clk_release, devm_clk_match, clk));
> +       WARN_ON(devres_release(dev, devm_clk_release, devm_clk_match, clk));
>  }
>  EXPORT_SYMBOL(devm_clk_unregister);
>  
> 
> -- 
> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
> hosted by The Linux Foundation
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> [e-mail]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Stephen Boyd Sept. 22, 2012, 7:20 a.m. UTC | #2

On 9/21/2012 6:07 PM, Mike Turquette wrote
> I'm not taking any more changes for 3.7, so in the interest of me being
> lazy can you resend with the fixup?

Sure. I'll pick up Mark's acks too and send the whole series again.

Patch

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 6852809..f02f4fe 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -1509,7 +1509,7 @@  static int devm_clk_match(struct device *dev, void *res, void *data)
  */
 void devm_clk_unregister(struct device *dev, struct clk *clk)
 {
-       WARN_ON(devres_destroy(dev, devm_clk_release, devm_clk_match, clk));
+       WARN_ON(devres_release(dev, devm_clk_release, devm_clk_match, clk));
 }
 EXPORT_SYMBOL(devm_clk_unregister);