Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1225575 > unrolled thread

[PATCH] c6x: Use generic clkdev.h header

Back to article view | Back to linux.kernel

Contents

  [PATCH] c6x: Use generic clkdev.h header Stephen Boyd <sboyd@codeaurora.org> - 2015-09-16 01:10 +0200
    Re: [PATCH] c6x: Use generic clkdev.h header Mark Salter <msalter@redhat.com> - 2015-09-16 16:00 +0200

#1225575 — [PATCH] 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 <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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1226098

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!


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web