diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-08-20 05:34:37 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-12 16:15:25 -0400 |
commit | a88a447d44648f1dfba4c40b3f4b6f75597150ed (patch) | |
tree | aef17e208be43ca6ec1e5ff83022b42f05535daf /arch/arm/mach-pxa | |
parent | 82d553c67deef92c6c84ecb70afc56e99863060c (diff) |
[ARM] pxa: remove get_lcdclk_frequency_10khz()
get_lcdclk_frequency_10khz() is now redundant, remove it. Hide
pxa27x_get_lcdclk_frequency_10khz() from public view.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/generic.c | 12 | ||||
-rw-r--r-- | arch/arm/mach-pxa/generic.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 2 |
3 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index ac2b1fc5bda9..2f0cc1c4995a 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c | |||
@@ -69,18 +69,6 @@ unsigned int get_memclk_frequency_10khz(void) | |||
69 | EXPORT_SYMBOL(get_memclk_frequency_10khz); | 69 | EXPORT_SYMBOL(get_memclk_frequency_10khz); |
70 | 70 | ||
71 | /* | 71 | /* |
72 | * Return the current LCD clock frequency in units of 10kHz | ||
73 | */ | ||
74 | unsigned int get_lcdclk_frequency_10khz(void) | ||
75 | { | ||
76 | if (cpu_is_pxa21x() || cpu_is_pxa25x()) | ||
77 | return pxa25x_get_memclk_frequency_10khz(); | ||
78 | else | ||
79 | return pxa27x_get_lcdclk_frequency_10khz(); | ||
80 | } | ||
81 | EXPORT_SYMBOL(get_lcdclk_frequency_10khz); | ||
82 | |||
83 | /* | ||
84 | * Handy function to set GPIO alternate functions | 72 | * Handy function to set GPIO alternate functions |
85 | */ | 73 | */ |
86 | 74 | ||
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h index 0a8a6f8a4f93..5b11741cccff 100644 --- a/arch/arm/mach-pxa/generic.h +++ b/arch/arm/mach-pxa/generic.h | |||
@@ -37,10 +37,8 @@ extern unsigned pxa25x_get_memclk_frequency_10khz(void); | |||
37 | #ifdef CONFIG_PXA27x | 37 | #ifdef CONFIG_PXA27x |
38 | extern unsigned pxa27x_get_clk_frequency_khz(int); | 38 | extern unsigned pxa27x_get_clk_frequency_khz(int); |
39 | extern unsigned pxa27x_get_memclk_frequency_10khz(void); | 39 | extern unsigned pxa27x_get_memclk_frequency_10khz(void); |
40 | extern unsigned pxa27x_get_lcdclk_frequency_10khz(void); | ||
41 | #else | 40 | #else |
42 | #define pxa27x_get_clk_frequency_khz(x) (0) | 41 | #define pxa27x_get_clk_frequency_khz(x) (0) |
43 | #define pxa27x_get_memclk_frequency_10khz() (0) | 42 | #define pxa27x_get_memclk_frequency_10khz() (0) |
44 | #define pxa27x_get_lcdclk_frequency_10khz() (0) | ||
45 | #endif | 43 | #endif |
46 | 44 | ||
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index f7762bf18623..d193755afb2b 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
@@ -105,7 +105,7 @@ unsigned int pxa27x_get_memclk_frequency_10khz(void) | |||
105 | /* | 105 | /* |
106 | * Return the current LCD clock frequency in units of 10kHz as | 106 | * Return the current LCD clock frequency in units of 10kHz as |
107 | */ | 107 | */ |
108 | unsigned int pxa27x_get_lcdclk_frequency_10khz(void) | 108 | static unsigned int pxa27x_get_lcdclk_frequency_10khz(void) |
109 | { | 109 | { |
110 | unsigned long ccsr; | 110 | unsigned long ccsr; |
111 | unsigned int l, L, k, K; | 111 | unsigned int l, L, k, K; |