Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9471c4e authored by Stephen Boyd's avatar Stephen Boyd
Browse files

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

* clk-composite-unregister:
  clk: composite: Add unregister function
parents 624b5ea6 92a39d90

drivers/clk/clk-composite.c

+15 −0
Original line number Diff line number Diff line
@@ -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);

}

include/linux/clk-provider.h

+1 −0
Original line number Diff line number Diff line
@@ -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