aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2016-01-27 17:18:02 -0500
committerStephen Boyd <sboyd@codeaurora.org>2018-01-02 18:41:24 -0500
commit590f306bc8dbea0b7f86af46aeb512ad2ed6e686 (patch)
treee8576f5bd2be2452c914a09423f7cf43736fbfff
parent4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff)
blackfin: Use generic clkdev.h header
The generic header file is equivalent to the blackfin version, so just use the generic one. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r--arch/blackfin/include/asm/Kbuild1
-rw-r--r--arch/blackfin/include/asm/clkdev.h17
2 files changed, 1 insertions, 17 deletions
diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild
index fe736973630f..40e44231743f 100644
--- a/arch/blackfin/include/asm/Kbuild
+++ b/arch/blackfin/include/asm/Kbuild
@@ -1,4 +1,5 @@
1generic-y += bugs.h 1generic-y += bugs.h
2generic-y += clkdev.h
2generic-y += current.h 3generic-y += current.h
3generic-y += device.h 4generic-y += device.h
4generic-y += div64.h 5generic-y += div64.h
diff --git a/arch/blackfin/include/asm/clkdev.h b/arch/blackfin/include/asm/clkdev.h
deleted file mode 100644
index ded0209348c7..000000000000
--- a/arch/blackfin/include/asm/clkdev.h
+++ /dev/null
@@ -1,17 +0,0 @@
1/* SPDX-License-Identifier: GPL-2.0 */
2#ifndef __ASM_CLKDEV__H_
3#define __ASM_CLKDEV__H_
4
5#include <linux/slab.h>
6
7static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)
8{
9 return kzalloc(size, GFP_KERNEL);
10}
11
12#ifndef CONFIG_COMMON_CLK
13#define __clk_put(clk)
14#define __clk_get(clk) ({ 1; })
15#endif
16
17#endif