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

Commit b0b6413f authored by Maxime Ripard's avatar Maxime Ripard
Browse files

clk: sunxi: Remove clk_register_clkdev calls 



Now that our protection code doesn't use the global name lookup anymore, we
can remove the clkdev registrations.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 3a4d9af4

drivers/clk/sunxi/clk-a10-hosc.c

+1 −2
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ 
 */



#include <linux/clk-provider.h>

#include <linux/clkdev.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/slab.h>



#define SUNXI_OSC24M_GATE	0
@@ -61,7 +61,6 @@ static void __init sun4i_osc_clk_setup(struct device_node *node) 
		goto err_free_gate;



	of_clk_add_provider(node, of_clk_src_simple_get, clk);

	clk_register_clkdev(clk, clk_name, NULL);



	return;

drivers/clk/sunxi/clk-a20-gmac.c

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
 */



#include <linux/clk-provider.h>

#include <linux/clkdev.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/slab.h>
@@ -107,7 +106,6 @@ static void __init sun7i_a20_gmac_clk_setup(struct device_node *node) 
		goto iounmap_reg;



	of_clk_add_provider(node, of_clk_src_simple_get, clk);

	clk_register_clkdev(clk, clk_name, NULL);



	return;

drivers/clk/sunxi/clk-factors.c

+0 −7
Original line number Diff line number Diff line
@@ -258,14 +258,8 @@ struct clk *sunxi_factors_register(struct device_node *node, 
	if (ret)

		goto err_provider;



	ret = clk_register_clkdev(clk, clk_name, NULL);

	if (ret)

		goto err_clkdev;



	return clk;



err_clkdev:

	of_clk_del_provider(node);

err_provider:

	/* TODO: The composite clock stuff will leak a bit here. */

	clk_unregister(clk);
@@ -291,7 +285,6 @@ void sunxi_factors_unregister(struct device_node *node, struct clk *clk) 
	factors = to_clk_factors(hw);

	name = clk_hw_get_name(hw);



	/* No unregister call for clkdev_* */

	of_clk_del_provider(node);

	/* TODO: The composite clock stuff will leak a bit here. */

	clk_unregister(clk);

drivers/clk/sunxi/clk-factors.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define __MACH_SUNXI_CLK_FACTORS_H



#include <linux/clk-provider.h>

#include <linux/clkdev.h>

#include <linux/spinlock.h>



#define SUNXI_FACTORS_NOT_APPLICABLE	(0)

drivers/clk/sunxi/clk-mod0.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <linux/clk.h>

#include <linux/clkdev.h>

#include <linux/clk-provider.h>

#include <linux/of_address.h>

#include <linux/platform_device.h>