* [PATCH] c6x: Use generic clkdev.h header
@ 2015-09-15 23:09 Stephen Boyd
2015-09-16 13:53 ` Mark Salter
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Boyd @ 2015-09-15 23:09 UTC (permalink / raw)
To: Mark Salter, Aurelien Jacquiot
Cc: linux-kernel, linux-clk, Michael Turquette, linux-c6x-dev
The c6x clkdev.h header is the same as the asm-generic header, so
just use the asm-generic one.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
arch/c6x/include/asm/Kbuild | 1 +
arch/c6x/include/asm/clkdev.h | 22 ----------------------
2 files changed, 1 insertion(+), 22 deletions(-)
delete mode 100644 arch/c6x/include/asm/clkdev.h
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index f17c4dc6050c..a9bc2c5106d2 100644
--- a/arch/c6x/include/asm/Kbuild
+++ b/arch/c6x/include/asm/Kbuild
@@ -4,6 +4,7 @@ generic-y += auxvec.h
generic-y += barrier.h
generic-y += bitsperlong.h
generic-y += bugs.h
+generic-y += clkdev.h
generic-y += cputime.h
generic-y += current.h
generic-y += device.h
diff --git a/arch/c6x/include/asm/clkdev.h b/arch/c6x/include/asm/clkdev.h
deleted file mode 100644
index 76a070b1c2e5..000000000000
--- a/arch/c6x/include/asm/clkdev.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _ASM_CLKDEV_H
-#define _ASM_CLKDEV_H
-
-#include <linux/slab.h>
-
-struct clk;
-
-static inline int __clk_get(struct clk *clk)
-{
- return 1;
-}
-
-static inline void __clk_put(struct clk *clk)
-{
-}
-
-static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)
-{
- return kzalloc(size, GFP_KERNEL);
-}
-
-#endif /* _ASM_CLKDEV_H */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] c6x: Use generic clkdev.h header
2015-09-15 23:09 [PATCH] c6x: Use generic clkdev.h header Stephen Boyd
@ 2015-09-16 13:53 ` Mark Salter
0 siblings, 0 replies; 2+ messages in thread
From: Mark Salter @ 2015-09-16 13:53 UTC (permalink / raw)
To: Stephen Boyd, Aurelien Jacquiot
Cc: linux-kernel, linux-clk, Michael Turquette, linux-c6x-dev
On Tue, 2015-09-15 at 16:09 -0700, Stephen Boyd wrote:
> The c6x clkdev.h header is the same as the asm-generic header, so
> just use the asm-generic one.
>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
Pulled into c6x tree for next merge window. Thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-09-16 13:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-15 23:09 [PATCH] c6x: Use generic clkdev.h header Stephen Boyd
2015-09-16 13:53 ` Mark Salter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).