diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-08-20 11:34:37 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-12 22:15:25 +0200 |
| commit | a88a447d44648f1dfba4c40b3f4b6f75597150ed (patch) | |
| tree | aef17e208be43ca6ec1e5ff83022b42f05535daf | |
| parent | [ARM] pxa: update pxa irda driver to use clk support (diff) | |
| download | linux-a88a447d44648f1dfba4c40b3f4b6f75597150ed.tar.xz linux-a88a447d44648f1dfba4c40b3f4b6f75597150ed.zip | |
[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>
| -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 | ||||
| -rw-r--r-- | include/asm-arm/arch-pxa/hardware.h | 1 |
4 files changed, 1 insertions, 16 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) EXPORT_SYMBOL(get_memclk_frequency_10khz); /* - * Return the current LCD clock frequency in units of 10kHz - */ -unsigned int get_lcdclk_frequency_10khz(void) -{ - if (cpu_is_pxa21x() || cpu_is_pxa25x()) - return pxa25x_get_memclk_frequency_10khz(); - else - return pxa27x_get_lcdclk_frequency_10khz(); -} -EXPORT_SYMBOL(get_lcdclk_frequency_10khz); - -/* * Handy function to set GPIO alternate functions */ 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); #ifdef CONFIG_PXA27x extern unsigned pxa27x_get_clk_frequency_khz(int); extern unsigned pxa27x_get_memclk_frequency_10khz(void); -extern unsigned pxa27x_get_lcdclk_frequency_10khz(void); #else #define pxa27x_get_clk_frequency_khz(x) (0) #define pxa27x_get_memclk_frequency_10khz() (0) -#define pxa27x_get_lcdclk_frequency_10khz() (0) #endif 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) /* * Return the current LCD clock frequency in units of 10kHz as */ -unsigned int pxa27x_get_lcdclk_frequency_10khz(void) +static unsigned int pxa27x_get_lcdclk_frequency_10khz(void) { unsigned long ccsr; unsigned int l, L, k, K; diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h index 386121746417..68e7b430ac80 100644 --- a/include/asm-arm/arch-pxa/hardware.h +++ b/include/asm-arm/arch-pxa/hardware.h @@ -122,7 +122,6 @@ extern void pxa_set_cken(int clock, int enable); * return current memory and LCD clock frequency in units of 10kHz */ extern unsigned int get_memclk_frequency_10khz(void); -extern unsigned int get_lcdclk_frequency_10khz(void); #endif |