[PATCH] drm/i915: fix compiler warnings in intel_audio.c

[PATCH] drm/i915: fix compiler warnings in intel_audio.c

[Geliang Tang]

Fix the following warnings:

  CC      drivers/gpu/drm/i915/intel_audio.o
drivers/gpu/drm/i915/intel_audio.c: In function ‘hsw_audio_codec_enable’:
drivers/gpu/drm/i915/intel_audio.c:332:39: warning: passing argument 2 of ‘audio_rate_need_prog’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
  if (audio_rate_need_prog(intel_crtc, adjusted_mode)) {
                                       ^
drivers/gpu/drm/i915/intel_audio.c:147:13: note: expected ‘struct drm_display_mode *’ but argument is of type ‘const struct drm_display_mode *’
 static bool audio_rate_need_prog(struct intel_crtc *crtc,
             ^

Signed-off-by: Geliang Tang <geliangtang@163.com>
---
 drivers/gpu/drm/i915/intel_audio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index baadd90..72d696b 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -145,7 +145,7 @@ static uint32_t audio_config_setup_n_reg(int n, uint32_t val)
 
 /* check whether N/CTS/M need be set manually */
 static bool audio_rate_need_prog(struct intel_crtc *crtc,
-					struct drm_display_mode *mode)
+				 const struct drm_display_mode *mode)
 {
 	if (((mode->clock == TMDS_297M) ||
 		 (mode->clock == TMDS_296M)) &&
-- 
2.5.0

Re: [PATCH] drm/i915: fix compiler warnings in intel_audio.c

[Jani Nikula]

On Wed, 30 Sep 2015, Geliang Tang <geliangtang@163.com> wrote:
> Fix the following warnings:
>
>   CC      drivers/gpu/drm/i915/intel_audio.o
> drivers/gpu/drm/i915/intel_audio.c: In function ‘hsw_audio_codec_enable’:
> drivers/gpu/drm/i915/intel_audio.c:332:39: warning: passing argument 2 of ‘audio_rate_need_prog’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
>   if (audio_rate_need_prog(intel_crtc, adjusted_mode)) {
>                                        ^
> drivers/gpu/drm/i915/intel_audio.c:147:13: note: expected ‘struct drm_display_mode *’ but argument is of type ‘const struct drm_display_mode *’
>  static bool audio_rate_need_prog(struct intel_crtc *crtc,
>              ^

Already fixed by Takashi:

http://mid.gmane.org/1443599103-26317-1-git-send-email-tiwai@suse.de

Thanks anyway,
Jani.


>
> Signed-off-by: Geliang Tang <geliangtang@163.com>
> ---
>  drivers/gpu/drm/i915/intel_audio.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index baadd90..72d696b 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -145,7 +145,7 @@ static uint32_t audio_config_setup_n_reg(int n, uint32_t val)
>  
>  /* check whether N/CTS/M need be set manually */
>  static bool audio_rate_need_prog(struct intel_crtc *crtc,
> -					struct drm_display_mode *mode)
> +				 const struct drm_display_mode *mode)
>  {
>  	if (((mode->clock == TMDS_297M) ||
>  		 (mode->clock == TMDS_296M)) &&
> -- 
> 2.5.0
>
>

-- 
Jani Nikula, Intel Open Source Technology Center