rk hdmi: fix compile warnning

diff --git a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c
index 2a4aa39e64efdf2588c3d78c6b1799e59b88d495..9cca081f5d966f8f65731aefe24b4367b6f39f9f 100644 (file)
--- a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c
+++ b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c
@@ -485,7 +485,9 @@ static int rk3288_hdmi_probe(struct platform_device *pdev)
        dev_info(hdmi_dev->dev, "rk3288 hdmi probe sucess.\n");
        return 0;
 
+#ifndef HDMI_INT_USE_POLL
 err1:
+#endif
        fb_unregister_client(&rk3288_hdmi_fb_notifier);
 #ifdef CONFIG_SWITCH
        switch_dev_unregister(&(dev_drv->switch_hdmi));

diff --git a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c
index baeea2db90a651d53675fca21a567dbc8e73bf8b..6a1e0da8cd52de9eb5d3faabb9045c898c663325 100644 (file)
--- a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c
+++ b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c
@@ -557,6 +557,7 @@ int rk3288_hdmi_video_sampler(struct hdmi *hdmi_drv,
        return 0;
 }
 
+#ifdef HDMI_DEBUG
 static int rk3288_hdmi_read_phy(struct rk3288_hdmi_device *hdmi_dev,
                                int reg_addr)
 {
@@ -600,6 +601,7 @@ static int rk3288_hdmi_read_phy(struct rk3288_hdmi_device *hdmi_dev,
 
        return -1;
 }
+#endif
 
 static int rk3288_hdmi_write_phy(struct rk3288_hdmi_device *hdmi_dev,
                                 int reg_addr, int val)

diff --git a/drivers/video/rockchip/hdmi/rk_hdmi_edid.c b/drivers/video/rockchip/hdmi/rk_hdmi_edid.c
index fa90f96bb84c39389cf8ceeb868f5e63b3a7c75a..e0238ff47970a78189bdbda9bfde3e04c57fcc00 100755 (executable)
--- a/drivers/video/rockchip/hdmi/rk_hdmi_edid.c
+++ b/drivers/video/rockchip/hdmi/rk_hdmi_edid.c
@@ -94,7 +94,10 @@ static int hdmi_edid_parse_dtd(unsigned char *block, struct fb_videomode *mode)
 static int hdmi_edid_parse_base(unsigned char *buf, int *extend_num,
                                struct hdmi_edid *pedid)
 {
-       int rc, i;
+       int rc;
+#ifdef DEBUG
+       int i = 0;
+#endif
 
        if (buf == NULL || extend_num == NULL)
                return E_HDMI_EDID_PARAM;

diff --git a/drivers/video/rockchip/hdmi/rk_hdmi_lcdc.c b/drivers/video/rockchip/hdmi/rk_hdmi_lcdc.c
index 0327f72518d6e53c2203bf8868bcc44fd4916007..fe65b3760f7696972e795e7c15e68ea8ae725dc8 100755 (executable)
--- a/drivers/video/rockchip/hdmi/rk_hdmi_lcdc.c
+++ b/drivers/video/rockchip/hdmi/rk_hdmi_lcdc.c
@@ -173,6 +173,7 @@ int hdmi_set_info(struct rk_screen *screen, unsigned int vic)
        return 0;
 }
 
+#ifdef HDMI_DEBUG
 static void hdmi_show_sink_info(struct hdmi *hdmi)
 {
        struct list_head *pos, *head = &hdmi->edid.modelist;
@@ -265,6 +266,7 @@ static void hdmi_show_sink_info(struct hdmi *hdmi)
        }
        hdmi_dbg(hdmi->dev, "******** Show Sink Info ********\n");
 }
+#endif
 
 /**
  * hdmi_ouputmode_select - select hdmi transmitter output mode: hdmi or dvi?