clk: Prepare to remove asm-generic/clkdev.h (0d4e3d00) · Commits · 戴 / test

Now that all the users of asm/clkdev.h have been replaced with the generic file we can get rid of the asm-generic file as well and implement that code directly where it's used. We only have one caller of __clkdev_alloc(), in clkdev.c so we can easily remove that and drop the include of asm/clkdev.h in linux/clkdev.h by putting the __clk_get/__clk_put inlines in their respective location. Cc: Russell King <linux@armlinux.org.uk> Signed-off-by:

Stephen Boyd <sboyd@codeaurora.org>

drivers/clk/clkdev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -256,7 +256,7 @@ vclkdev_alloc(struct clk_hw hw, const char con_id, const char *dev_fmt,
		{
		struct clk_lookup_alloc *cla;

		cla = __clkdev_alloc(sizeof(*cla));
		cla = kzalloc(sizeof(*cla), GFP_KERNEL);
		if (!cla)
		return NULL;

include/linux/clkdev.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@
		#ifndef __CLKDEV_H
		#define __CLKDEV_H

		#include <asm/clkdev.h>
		#include <linux/slab.h>

		struct clk;
		struct clk_hw;
		@@ -55,6 +55,9 @@ int clk_hw_register_clkdev(struct clk_hw , const char , const char *);
		#ifdef CONFIG_COMMON_CLK
		int __clk_get(struct clk *clk);
		void __clk_put(struct clk *clk);
		#else
		static inline int __clk_get(struct clk *clk) { return 1; }
		static inline void __clk_put(struct clk *clk) { }
		#endif

		#endif

Admin message