From 391268171eed29d53712ee367f28c9b4c9d50584 Mon Sep 17 00:00:00 2001 From: zwl Date: Mon, 16 Jun 2014 11:18:30 +0800 Subject: [PATCH] rk hdmi: fix compile warnning --- drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c | 2 ++ drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c | 2 ++ drivers/video/rockchip/hdmi/rk_hdmi_edid.c | 5 ++++- drivers/video/rockchip/hdmi/rk_hdmi_lcdc.c | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c index 2a4aa39e64ef..9cca081f5d96 100644 --- 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 baeea2db90a6..6a1e0da8cd52 100644 --- 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 fa90f96bb84c..e0238ff47970 100755 --- 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 0327f72518d6..fe65b3760f76 100755 --- 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? -- 2.34.1