Skip to contentSkip to conversation

c6x: Use generic clkdev.h header

PATCH In review Stephen Boyd 2 participants 2 messages Sep 15, 2015 – Sep 16, 2015 Common clk

lore
Share & tools
lore

Stephen Boyd

author
#0 lore raw

PATCH 1/1 c6x: Use generic clkdev.h header

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 <[email protected]>
---
 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
arch/c6x/include/asm/Kbuild +1 -0
index f17c4dc6050c..a9bc2c5106d2 100644
@@ -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
arch/c6x/include/asm/clkdev.h deleted +0 -22
deleted file mode 100644
index 76a070b1c2e5..000000000000
@@ -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 */
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#1 lore raw
Quoted 5 lines · Stephen Boyd

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 <[email protected]>

---

Pulled into c6x tree for next merge window. Thanks!