From 4dd1fcc6525d5b8d2c396a61b07ea57b147a51d3 Mon Sep 17 00:00:00 2001 From: zwl Date: Thu, 20 Mar 2014 09:07:01 +0800 Subject: [PATCH] HDMI: fix some code err --- drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c | 2 +- drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c | 4 ++-- drivers/video/rockchip/hdmi/rk_hdmi_task.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c index 4c9e688be42f..59aba225006d 100644 --- a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c +++ b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c @@ -190,7 +190,7 @@ static int rk3288_hdmi_parse_dt(struct rk3288_hdmi_device *hdmi_dev) } static const struct of_device_id rk3288_hdmi_dt_ids[] = { - {.compatible = "rockchips,rk3288-hdmi",}, + {.compatible = "rockchip,rk3288-hdmi",}, {} }; #endif 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 f073ce0c9ffc..355c2f512ad4 100644 --- a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c +++ b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c @@ -49,7 +49,7 @@ static void rk3288_hdmi_set_pwr_mode(struct hdmi *hdmi_drv, int mode) if(hdmi_drv->pwr_mode == mode) return; - hdmi_dbg(hdmi->dev,"%s change pwr_mode %d --> %d\n",__FUNCTION__, hdmi_drv->pwr_mode, mode); + hdmi_dbg(hdmi_drv->dev,"%s change pwr_mode %d --> %d\n",__FUNCTION__, hdmi_drv->pwr_mode, mode); switch(mode) { case NORMAL: @@ -511,7 +511,7 @@ int rk3288_hdmi_config_vsi(struct hdmi *hdmi_drv, unsigned char vic_3d, unsigned int id = 0x000c03; struct rk3288_hdmi_device *hdmi_dev = container_of(hdmi_drv, struct rk3288_hdmi_device, driver); - hdmi_dbg(hdmi_drv->dev, "[%s] vic %d format %d.\n", __FUNCTION__, vic, format); + hdmi_dbg(hdmi_drv->dev, "[%s] vic %d format %d.\n", __FUNCTION__, vic_3d, format); hdmi_msk_reg(hdmi_dev, FC_DATAUTO0, m_VSD_AUTO, v_VSD_AUTO(0)); hdmi_writel(hdmi_dev, FC_VSDIEEEID0, id & 0xff); hdmi_writel(hdmi_dev, FC_VSDIEEEID1, (id >> 8) & 0xff); diff --git a/drivers/video/rockchip/hdmi/rk_hdmi_task.c b/drivers/video/rockchip/hdmi/rk_hdmi_task.c index 4eccf14d7206..4a99f1e92f79 100755 --- a/drivers/video/rockchip/hdmi/rk_hdmi_task.c +++ b/drivers/video/rockchip/hdmi/rk_hdmi_task.c @@ -40,7 +40,7 @@ static void hdmi_sys_show_state(struct hdmi *hdmi) hdmi_dbg(hdmi->dev, "PLAY_BACK\n"); break; default: - hdmi_dbg(hdmi->dev, "Unkown State %d\n", state); + hdmi_dbg(hdmi->dev, "Unkown State %d\n", hdmi->state); break; } } -- 2.34.1