[Intel-gfx] [PATCH] drm/i915/display: Remove useless but deadly local

[Jani Nikula]

On Thu, 26 Mar 2020, Chris Wilson <chris at chris-wilson.co.uk> wrote:
> Beware dereferencing the NULL pointer prior to checking for its
> existence.

Huh, I don't see the failure mode. Please enlighten me.

BR,
Jani.

>
> Fixes: 419190429cd1 ("drm/i915/hdmi: use struct drm_device based logging")
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Wambui Karuga <wambui.karugax at gmail.com>
> Cc: Jani Nikula <jani.nikula at intel.com>
> Cc: "Ville Syrjälä" <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_hdmi.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index 395dc192baa0..0076abc63851 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -691,7 +691,6 @@ void intel_read_infoframe(struct intel_encoder *encoder,
>  			  union hdmi_infoframe *frame)
>  {
>  	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
> -	struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
>  	u8 buffer[VIDEO_DIP_DATA_SIZE];
>  	int ret;
>  
> @@ -708,13 +707,13 @@ void intel_read_infoframe(struct intel_encoder *encoder,
>  	/* see comment above for the reason for this offset */
>  	ret = hdmi_infoframe_unpack(frame, buffer + 1, sizeof(buffer) - 1);
>  	if (ret) {
> -		drm_dbg_kms(&i915->drm,
> +		drm_dbg_kms(encoder->base.dev,
>  			    "Failed to unpack infoframe type 0x%02x\n", type);
>  		return;
>  	}
>  
>  	if (frame->any.type != type)
> -		drm_dbg_kms(&i915->drm,
> +		drm_dbg_kms(encoder->base.dev,
>  			    "Found the wrong infoframe type 0x%x (expected 0x%02x)\n",
>  			    frame->any.type, type);
>  }

-- 
Jani Nikula, Intel Open Source Graphics Center