[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>

diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index ac2b1fc5bda996f0b9bcd61c81fef9093fd96a29..2f0cc1c4995adfc79c707ce1134edbb9d5696496 100644 (file)
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -68,18 +68,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 0a8a6f8a4f930d32ecbb13ce68c57034488513fc..5b11741cccff0fe7fd5f2577596ddfa8213822c1 100644 (file)
--- 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 f7762bf186237d8d793d122b98f7aff92c7c2f59..d193755afb2b4cab1585ec8f1a072c1f78702d81 100644 (file)
--- 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 386121746417093c90d6807bda3cc90d3d2c7e91..68e7b430ac8076f40845bca982ea19e19d8c631f 100644 (file)
--- 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