GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-17 20:54:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clk: Prepare to remove asm-generic/clkdev.h

Browse source 
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>
This commit is contained in:
Stephen Boyd 2018-01-02 15:47:07 -08:00
parent 590f306bc8
commit 0d4e3d005c
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/clk/clkdev.c
View file

@ -256,7 +256,7 @@ vclkdev_alloc(struct clk_hw *hw, const char *con_id, const char *dev_fmt,
{ {
struct clk_lookup_alloc *cla; struct clk_lookup_alloc *cla;
cla = __clkdev_alloc(sizeof(*cla)); cla = kzalloc(sizeof(*cla), GFP_KERNEL);
if (!cla) if (!cla)
return NULL; return NULL;

5
include/linux/clkdev.h
View file

@ -12,7 +12,7 @@
#ifndef __CLKDEV_H #ifndef __CLKDEV_H
#define __CLKDEV_H #define __CLKDEV_H
#include <asm/clkdev.h> #include <linux/slab.h>
struct clk; struct clk;
struct clk_hw; struct clk_hw;
@ -55,6 +55,9 @@ int clk_hw_register_clkdev(struct clk_hw *, const char *, const char *);
#ifdef CONFIG_COMMON_CLK #ifdef CONFIG_COMMON_CLK
int __clk_get(struct clk *clk); int __clk_get(struct clk *clk);
void __clk_put(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
#endif #endif