[PATCH v3 4/4] OMAPDSS: HDMI: remove duplicate code and mode parameter

[mythripk]

From: Mythri P K <mythr...@ti.com>

code and mode parameters are already a part of the ip_data structure
so no need to keep the same parameters again in hdmi global structure.

Signed-off-by: Mythri P K <mythr...@ti.com>
---
 drivers/video/omap2/dss/hdmi.c |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 78aa904..4bb7678 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -66,8 +66,6 @@ static struct {
        struct omap_display_platform_data *pdata;
        struct platform_device *pdev;
        struct hdmi_ip_data ip_data;
-       int code;
-       int mode;
 
        struct clk *sys_clk;
 } hdmi;
@@ -163,7 +161,7 @@ static const struct hdmi_config *hdmi_find_timing(
        const struct hdmi_config *timing = NULL;
 
        for (i = 0; i < len; i++) {
-               if (timings_arr[i].cm.code == hdmi.code) {
+               if (timings_arr[i].cm.code == hdmi.ip_data.cfg.cm.code) {
                        timing = &timings_arr[i];
                        return timing;
                }
@@ -176,7 +174,7 @@ static const struct hdmi_config *hdmi_get_timings(void)
        const struct hdmi_config *arr;
        int len;
 
-       if (hdmi.mode == HDMI_DVI) {
+       if (hdmi.ip_data.cfg.cm.mode == HDMI_DVI) {
                arr = vesa_timings;
                len = ARRAY_SIZE(vesa_timings);
        } else {
@@ -314,9 +312,9 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
 
        if (hdmi_get_timings() == NULL) {
                /* HDMI code 4 corresponds to 640 * 480 VGA */
-               hdmi.code = 4;
+               hdmi.ip_data.cfg.cm.code = 4;
                /* DVI mode 1 corresponds to HDMI 0 to DVI */
-               hdmi.mode = HDMI_DVI;
+               hdmi.ip_data.cfg.cm.mode = HDMI_DVI;
                hdmi.ip_data.cfg = vesa_timings[0];
        } else {
                hdmi.ip_data.cfg = *(hdmi_get_timings());
@@ -340,8 +338,6 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
                goto err;
        }
 
-       hdmi.ip_data.cfg.cm.mode = hdmi.mode;
-       hdmi.ip_data.cfg.cm.code = hdmi.code;
        hdmi.ip_data.ops->video_configure(&hdmi.ip_data);
 
        /* Make selection of HDMI in DSS */
@@ -401,8 +397,8 @@ void omapdss_hdmi_display_set_timing(struct omap_dss_device 
*dssdev)
        struct hdmi_cm cm;
 
        cm = hdmi_get_code(&dssdev->panel.timings);
-       hdmi.code = cm.code;
-       hdmi.mode = cm.mode;
+       hdmi.ip_data.cfg.cm.code = cm.code;
+       hdmi.ip_data.cfg.cm.mode = cm.mode;
 
        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
                int r;
@@ -668,7 +664,7 @@ static int hdmi_audio_hw_params(struct hdmi_ip_data 
*ip_data,
 static int hdmi_audio_startup(struct snd_pcm_substream *substream,
                                  struct snd_soc_dai *dai)
 {
-       if (!hdmi.mode) {
+       if (!hdmi.ip_data.cfg.cm.mode) {
                pr_err("Current video settings do not support audio.\n");
                return -EIO;
        }
-- 
1.7.5.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html