s5pc110: Remove unused functions and use the common header file

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c
index 5683f83..53a7b7d 100644 (file)
--- a/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@ -237,11 +237,6 @@ static int board_is_media(void)
        return machine_is_aquila() && (board_rev & MEDIA_BOARD);
 }
 
-static int board_is_bamboo(void)
-{
-       return machine_is_aquila() && (board_rev & BAMBOO_BOARD);
-}
-
 static int board_is_j1b2(void)
 {
        return machine_is_aquila() && (board_rev & J1_B2_BOARD);
@@ -1372,20 +1367,7 @@ static void setup_power_down_mode_registers(void)
 }
 
 #ifdef CONFIG_LCD
-struct spi_platform_data {
-       struct s5pc1xx_gpio_bank *cs_bank;
-       struct s5pc1xx_gpio_bank *clk_bank;
-       struct s5pc1xx_gpio_bank *si_bank;
-       struct s5pc1xx_gpio_bank *so_bank;
-
-       unsigned int cs_num;
-       unsigned int clk_num;
-       unsigned int si_num;
-       unsigned int so_num;
-
-       unsigned int board_is_media;
-       unsigned int board_is_cypress;
-};
+#include "../../../drivers/video/s5p-spi.h"
 
 extern void s6e63m0_set_platform_data(struct spi_platform_data *pd);
 extern void s6d16a0x_set_platform_data(struct spi_platform_data *pd);
@@ -1467,7 +1449,7 @@ void lcd_cfg_gpio(void)
                else {
                        s6e63m0_set_platform_data(&spi_pd);
                        if (board_is_media())
-                               spi_pd.board_is_media = 1;
+                               spi_pd.set_rev = 1;
                }
        }
 
@@ -1497,7 +1479,7 @@ void lcd_cfg_gpio(void)
                spi_pd.si_bank = &gpio_base->gpio_mp0_4;
                spi_pd.si_num = 2;
 
-               spi_pd.board_is_cypress = 1;
+               spi_pd.set_rev = 1;
 
                /* these data would be sent to s6e63m0 lcd panel driver. */
                s6e63m0_set_platform_data(&spi_pd);

diff --git a/drivers/video/s5p-spi.h b/drivers/video/s5p-spi.h
index 85fc76d..5a5114d 100644 (file)
--- a/drivers/video/s5p-spi.h
+++ b/drivers/video/s5p-spi.h
@@ -18,7 +18,6 @@ struct spi_platform_data {
        unsigned int si_num;
        unsigned int so_num;
 
-       unsigned int board_is_media;
-       unsigned int board_is_cypress
+       unsigned int set_rev;
 };
 

diff --git a/drivers/video/s6d16a0x.c b/drivers/video/s6d16a0x.c
index 8c29638..725bd9a 100644 (file)
--- a/drivers/video/s6d16a0x.c
+++ b/drivers/video/s6d16a0x.c
@@ -428,6 +428,7 @@ static void s6d16a0x_c110_spi_write_byte(unsigned char address, unsigned char co
        udelay(Delay);
 }
 
+#ifdef UNUSED_FUNCTIONS
 static unsigned char s6d16a0x_c110_spi_read_byte(unsigned char select, unsigned char address)
 {
        int     j;
@@ -487,6 +488,7 @@ static unsigned char s6d16a0x_c110_spi_read_byte(unsigned char select, unsigned
 
        return command;
 }
+#endif
 
 static void s6d16a0x_spi_write(unsigned char address, unsigned char command)
 {

diff --git a/drivers/video/s6e63m0.c b/drivers/video/s6e63m0.c
index 8b253d4..c4bef54 100644 (file)
--- a/drivers/video/s6e63m0.c
+++ b/drivers/video/s6e63m0.c
@@ -424,7 +424,7 @@ static void s6e63m0_c110_spi_write_byte(unsigned char address, unsigned char com
        udelay(DELAY);
 }
 
-
+#ifdef UNUSED_FUNCTION
 static unsigned char s6e63m0_c110_spi_read_byte(unsigned char select, unsigned char address)
 {
        int     j;
@@ -484,6 +484,7 @@ static unsigned char s6e63m0_c110_spi_read_byte(unsigned char select, unsigned c
 
        return command;
 }
+#endif
 
 static void s6e63m0_spi_write(unsigned char address, unsigned char command)
 {
@@ -516,7 +517,7 @@ void s6e63m0_cfg_ldo(void)
 
        s6e63m0_panel_send_sequence(SEQ_PANEL_CONDITION_SET);
 
-       if (s6e63m0->board_is_media || s6e63m0->board_is_cypress)
+       if (s6e63m0->set_rev)
                s6e63m0_panel_send_sequence(SEQ_DISPLAY_CONDITION_SET_REV);
        else
                s6e63m0_panel_send_sequence(SEQ_DISPLAY_CONDITION_SET);