[14/15] OMAPDSS: HDMI: remove the unused code

Commit Message

Tomi Valkeinen June 27, 2014, 10:16 a.m. UTC

On 26/06/14 22:05, Jyri Sarha wrote:
> On 06/24/2014 01:03 PM, Tomi Valkeinen wrote:
>> We no longer need the horrible driver internal videmode tables, which
>> were used to decide if a given videomode is a HDMI or DVI mode. So
>> remove all related code.
>>
>> Signed-off-by: Tomi Valkeinen <[e-mail]>
>> ---
>>   drivers/video/fbdev/omap2/dss/hdmi.h        |  11 -
>>   drivers/video/fbdev/omap2/dss/hdmi_common.c | 316
>> ----------------------------
>>   2 files changed, 327 deletions(-)
>>
>> diff --git a/drivers/video/fbdev/omap2/dss/hdmi.h
>> b/drivers/video/fbdev/omap2/dss/hdmi.h
>> index e3956defc1c3..262771b9b76b 100644
>> --- a/drivers/video/fbdev/omap2/dss/hdmi.h
>> +++ b/drivers/video/fbdev/omap2/dss/hdmi.h
> ...
>> @@ -192,7 +187,6 @@ struct hdmi_video_format {
>>
>>   struct hdmi_config {
>>       struct omap_video_timings timings;
>> -    struct hdmi_cm cm;
>>       struct hdmi_avi_infoframe infoframe;
>>       enum hdmi_core_hdmi_dvi hdmi_dvi_mode;
>>   };
> 
> The HDMI audio finctionality is broken already now, but removing
> hdmi_config.cm will cause compilation failure if HDMI audio is enabled.

Ah, true.

> I'll mail a patch set to fix OMAP4+ HDMI audio shortly. The set should
> be applied on top of these patches and it fixes (obviously) the
> compilation issue too.

I'll rather fix my series. It's not good to introduce compilation errors.

So I'll just add the following in my patches:

        }
@@ -529,7 +529,7 @@ static bool hdmi_audio_supported(struct
omap_dss_device *dssdev)

        mutex_lock(&hdmi.lock);

-       r = hdmi_mode_has_audio(hdmi.cfg.cm.mode);
+       r = hdmi_mode_has_audio(hdmi.cfg.hdmi_dvi_mode);

        mutex_unlock(&hdmi.lock);
        return r;
@@ -543,7 +543,7 @@ static int hdmi_audio_config(struct omap_dss_device
*dssdev,

        mutex_lock(&hdmi.lock);

-       if (!hdmi_mode_has_audio(hdmi.cfg.cm.mode)) {
+       if (!hdmi_mode_has_audio(hdmi.cfg.hdmi_dvi_mode)) {
                r = -EPERM;
                goto err;
        }

Comments

Tomi Valkeinen June 27, 2014, 10:20 a.m. UTC | #1

On 27/06/14 13:16, Tomi Valkeinen wrote:
> On 26/06/14 22:05, Jyri Sarha wrote:
>> On 06/24/2014 01:03 PM, Tomi Valkeinen wrote:
>>> We no longer need the horrible driver internal videmode tables, which
>>> were used to decide if a given videomode is a HDMI or DVI mode. So
>>> remove all related code.
>>>
>>> Signed-off-by: Tomi Valkeinen <[e-mail]>
>>> ---
>>>   drivers/video/fbdev/omap2/dss/hdmi.h        |  11 -
>>>   drivers/video/fbdev/omap2/dss/hdmi_common.c | 316
>>> ----------------------------
>>>   2 files changed, 327 deletions(-)
>>>
>>> diff --git a/drivers/video/fbdev/omap2/dss/hdmi.h
>>> b/drivers/video/fbdev/omap2/dss/hdmi.h
>>> index e3956defc1c3..262771b9b76b 100644
>>> --- a/drivers/video/fbdev/omap2/dss/hdmi.h
>>> +++ b/drivers/video/fbdev/omap2/dss/hdmi.h
>> ...
>>> @@ -192,7 +187,6 @@ struct hdmi_video_format {
>>>
>>>   struct hdmi_config {
>>>       struct omap_video_timings timings;
>>> -    struct hdmi_cm cm;
>>>       struct hdmi_avi_infoframe infoframe;
>>>       enum hdmi_core_hdmi_dvi hdmi_dvi_mode;
>>>   };
>>
>> The HDMI audio finctionality is broken already now, but removing
>> hdmi_config.cm will cause compilation failure if HDMI audio is enabled.
> 
> Ah, true.
> 
>> I'll mail a patch set to fix OMAP4+ HDMI audio shortly. The set should
>> be applied on top of these patches and it fixes (obviously) the
>> compilation issue too.
> 
> I'll rather fix my series. It's not good to introduce compilation errors.
> 
> So I'll just add the following in my patches:
> 
> diff --git a/drivers/video/fbdev/omap2/dss/hdmi4.c

Oh, and the same for hdmi5.c. Although that code is not compiled anyway,
but I think it's still better to fix it.

That could introduce a conflict with your series, but it's trivial.

 Tomi

Patch

diff --git a/drivers/video/fbdev/omap2/dss/hdmi4.c
b/drivers/video/fbdev/omap2/dss/hdmi4.c
index 342ddb47811a..6a8550cf43e5 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi4.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi4.c
@@ -491,7 +491,7 @@  static int hdmi_audio_enable(struct omap_dss_device
*dssdev)

        mutex_lock(&hdmi.lock);

-       if (!hdmi_mode_has_audio(hdmi.cfg.cm.mode)) {
+       if (!hdmi_mode_has_audio(hdmi.cfg.hdmi_dvi_mode)) {
                r = -EPERM;
                goto err;