Merge branch 'clk-composite-unregister' into clk-next

* clk-composite-unregister:
  clk: composite: Add unregister function
This commit is contained in:
Stephen Boyd 2016-04-21 14:43:56 -07:00
commit e9471c4ecf
2 changed files with 16 additions and 0 deletions

View File

@ -319,3 +319,18 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
kfree(composite);
return clk;
}
void clk_unregister_composite(struct clk *clk)
{
struct clk_composite *composite;
struct clk_hw *hw;
hw = __clk_get_hw(clk);
if (!hw)
return;
composite = to_clk_composite(hw);
clk_unregister(clk);
kfree(composite);
}

View File

@ -604,6 +604,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
struct clk_hw *rate_hw, const struct clk_ops *rate_ops,
struct clk_hw *gate_hw, const struct clk_ops *gate_ops,
unsigned long flags);
void clk_unregister_composite(struct clk *clk);
/***
* struct clk_gpio_gate - gpio gated clock