浏览代码

[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>
Russell King 17 年之前
父节点
当前提交
a88a447d44
共有 4 个文件被更改,包括 1 次插入16 次删除
  1. 0 12
      arch/arm/mach-pxa/generic.c
  2. 0 2
      arch/arm/mach-pxa/generic.h
  3. 1 1
      arch/arm/mach-pxa/pxa27x.c
  4. 0 1
      include/asm-arm/arch-pxa/hardware.h

+ 0 - 12
arch/arm/mach-pxa/generic.c

@@ -68,18 +68,6 @@ unsigned int get_memclk_frequency_10khz(void)
 }
 }
 EXPORT_SYMBOL(get_memclk_frequency_10khz);
 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
  * Handy function to set GPIO alternate functions
  */
  */

+ 0 - 2
arch/arm/mach-pxa/generic.h

@@ -37,10 +37,8 @@ extern unsigned pxa25x_get_memclk_frequency_10khz(void);
 #ifdef CONFIG_PXA27x
 #ifdef CONFIG_PXA27x
 extern unsigned pxa27x_get_clk_frequency_khz(int);
 extern unsigned pxa27x_get_clk_frequency_khz(int);
 extern unsigned pxa27x_get_memclk_frequency_10khz(void);
 extern unsigned pxa27x_get_memclk_frequency_10khz(void);
-extern unsigned pxa27x_get_lcdclk_frequency_10khz(void);
 #else
 #else
 #define pxa27x_get_clk_frequency_khz(x)		(0)
 #define pxa27x_get_clk_frequency_khz(x)		(0)
 #define pxa27x_get_memclk_frequency_10khz()	(0)
 #define pxa27x_get_memclk_frequency_10khz()	(0)
-#define pxa27x_get_lcdclk_frequency_10khz()	(0)
 #endif
 #endif
 
 

+ 1 - 1
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
  * 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 long ccsr;
 	unsigned int l, L, k, K;
 	unsigned int l, L, k, K;

+ 0 - 1
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
  * return current memory and LCD clock frequency in units of 10kHz
  */
  */
 extern unsigned int get_memclk_frequency_10khz(void);
 extern unsigned int get_memclk_frequency_10khz(void);
-extern unsigned int get_lcdclk_frequency_10khz(void);
 
 
 #endif
 #endif