gpu: drm: i915: remove dead code
Subsystems (2)
PATCH 1/2 gpu: drm: i915: remove dead code
Local variable has_reduced_clock is assigned to a constant value and it is never updated again. Remove this variable and the dead code it guards.
Addresses-Coverity-ID: 1362230
Signed-off-by Gustavo A. R. Silva <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -8
@@ -9565,8 +9565,6 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc, {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct dpll reduced_clock; -bool has_reduced_clock = false;struct intel_shared_dpll *pll;const struct intel_limit *limit;int refclk =120000 ;
@@ -9609,8 +9607,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,return -EINVAL ; } -ironlake_compute_dpll (crtc, crtc_state, - has_reduced_clock ? &reduced_clock :NULL ); +ironlake_compute_dpll (crtc, crtc_state,NULL ); pll =intel_get_shared_dpll (crtc, crtc_state,NULL );if (pll ==NULL ) {
@@ -9619,10 +9616,6 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,return -EINVAL ; } -if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS ) && - has_reduced_clock) - crtc->lowfreq_avail = true; -return 0 ; }
Signature · 1 line
2.5.0
PATCH 2/2 gpu: drm: i915: compress logic into one line
Simplify logic to avoid unnecessary variable declaration and assignment.
Signed-off-by Gustavo A. R. Silva <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -3
@@ -9565,7 +9565,6 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc, {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_shared_dpll *pll;const struct intel_limit *limit;int refclk =120000 ;
@@ -9609,8 +9608,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,ironlake_compute_dpll (crtc, crtc_state,NULL ); - pll =intel_get_shared_dpll (crtc, crtc_state,NULL ); -if (pll ==NULL ) { +if (!intel_get_shared_dpll (crtc, crtc_state,NULL )) {DRM_DEBUG_DRIVER ("failed to find PLL for pipe %c\n" ,pipe_name (crtc->pipe));return -EINVAL ;
Signature · 1 line
2.5.0
Re: [PATCH 2/2] gpu: drm: i915: compress logic into one line
Quoted 3 lines · Gustavo A. R. Silva
Simplify logic to avoid unnecessary variable declaration and assignment.
Signed-off-by Gustavo A. R. Silva <[email protected]>
Both applied, thanks.
-Daniel
Quoted 33 lines
--- drivers/gpu/drm/i915/intel_display.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/i915/intel_display.c +1
-3@@ -9565,7 +9565,6 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc, {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_shared_dpll *pll;const struct intel_limit *limit;int refclk =120000 ;@@ -9609,8 +9608,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc,ironlake_compute_dpll (crtc, crtc_state,NULL ); - pll =intel_get_shared_dpll (crtc, crtc_state,NULL ); -if (pll ==NULL ) { +if (!intel_get_shared_dpll (crtc, crtc_state,NULL )) {DRM_DEBUG_DRIVER ("failed to find PLL for pipe %c\n" ,pipe_name (crtc->pipe));return -EINVAL ;Signature · 6 lines
2.5.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel