[PATCH] drm/i915/lvds: Remove dead code from failing case

[PATCH] drm/i915/lvds: Remove dead code from failing case

[Damien Lespiau]

Coverity points out that, if we end up in the 'failed' label, that's
precisely because we couldn't retrieve a fixed mode (ie fixed_mode is
NULL) and then "if (fixed_mode)" is always false.

Remove that dead code.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 drivers/gpu/drm/i915/intel_lvds.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 6341a88..3984608 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -1125,8 +1125,6 @@ failed:
 	DRM_DEBUG_KMS("No LVDS modes found, disabling.\n");
 	drm_connector_cleanup(connector);
 	drm_encoder_cleanup(encoder);
-	if (fixed_mode)
-		drm_mode_destroy(dev, fixed_mode);
 	kfree(lvds_encoder);
 	kfree(lvds_connector);
 	return;
-- 
1.8.3.1

Re: [PATCH] drm/i915/lvds: Remove dead code from failing case

[Paulo Zanoni]

2014-02-13 16:56 GMT-02:00 Damien Lespiau <damien.lespiau@intel.com>:
> Coverity points out that, if we end up in the 'failed' label, that's
> precisely because we couldn't retrieve a fixed mode (ie fixed_mode is
> NULL) and then "if (fixed_mode)" is always false.
>
> Remove that dead code.
>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_lvds.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index 6341a88..3984608 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -1125,8 +1125,6 @@ failed:
>         DRM_DEBUG_KMS("No LVDS modes found, disabling.\n");
>         drm_connector_cleanup(connector);
>         drm_encoder_cleanup(encoder);
> -       if (fixed_mode)
> -               drm_mode_destroy(dev, fixed_mode);
>         kfree(lvds_encoder);
>         kfree(lvds_connector);
>         return;
> --
> 1.8.3.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Paulo Zanoni

Re: [PATCH] drm/i915/lvds: Remove dead code from failing case

[Daniel Vetter]

On Thu, Feb 13, 2014 at 05:04:48PM -0200, Paulo Zanoni wrote:
> 2014-02-13 16:56 GMT-02:00 Damien Lespiau <damien.lespiau@intel.com>:
> > Coverity points out that, if we end up in the 'failed' label, that's
> > precisely because we couldn't retrieve a fixed mode (ie fixed_mode is
> > NULL) and then "if (fixed_mode)" is always false.
> >
> > Remove that dead code.
> >
> > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> 
> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch