drm/i915: remove set but unused variables
Subsystems (2)
PATCH 1/1 drm/i915: remove set but unused variables
From: Paulo Zanoni <[email protected]>
Caught by "make W=1 drivers/gpu/drm/i915/".
Signed-off-by Paulo Zanoni <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 12 ++---------- drivers/gpu/drm/i915/intel_dp.c | 3 --- drivers/gpu/drm/i915/intel_hdmi.c | 2 -- 3 files changed, 2 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -10
@@ -690,7 +690,7 @@ vlv_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc, {u32 p1, p2, m1, m2, vco, bestn, bestm1, bestm2, bestp1, bestp2;u32 m, n, fastclk; -u32 updrate, minupdate, fracbits, p; +u32 updrate, minupdate, p;unsigned long bestppm, ppm, absppm;int dotclk, flag;
@@ -701,7 +701,6 @@ vlv_find_best_dpll(const intel_limit_t *limit, struct drm_crtc *crtc, fastclk = dotclk / (2 *100 ); updrate =0 ; minupdate =19200 ; - fracbits =1 ; n = p = p1 = p2 = m = m1 = m2 = vco = bestn =0 ; bestm1 = bestm2 = bestp1 = bestp2 =0 ;
@@ -4423,13 +4422,10 @@ static void vlv_update_pll(struct intel_crtc *crtc)int pipe = crtc->pipe;u32 dpll, mdiv;u32 bestn, bestm1, bestm2, bestp1, bestp2; -bool is_hdmi;u32 coreclk, reg_val, dpll_md;mutex_lock (&dev_priv->dpio_lock); - is_hdmi =intel_pipe_has_type (&crtc->base,INTEL_OUTPUT_HDMI ); - bestn = crtc->config.dpll.n; bestm1 = crtc->config.dpll.m1; bestm2 = crtc->config.dpll.m2;
@@ -8896,14 +8892,13 @@ intel_modeset_stage_output_state(struct drm_device *dev,struct drm_crtc *new_crtc;struct intel_connector *connector;struct intel_encoder *encoder; -int count, ro; +int ro;/* The upper layers ensure that we either disable a crtc or have a list * of connectors. For paranoia, double-check this. */ WARN_ON (!set->fb && (set->num_connectors !=0 ));WARN_ON (set->fb && (set->num_connectors ==0 )); - count =0 ;list_for_each_entry (connector, &dev->mode_config.connector_list, base.head) {/* Otherwise traverse passed in connector list and get encoders
@@ -8937,7 +8932,6 @@ intel_modeset_stage_output_state(struct drm_device *dev,/* connector->new_encoder is now updated for all connectors. */ /* Update crtc of enabled connectors. */ - count =0 ;list_for_each_entry (connector, &dev->mode_config.connector_list, base.head) {if (!connector->new_encoder)
@@ -10297,7 +10291,6 @@ void intel_modeset_cleanup(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;struct drm_crtc *crtc; -struct intel_crtc *intel_crtc;/* * Interrupts and polling as the first thing to avoid creating havoc.
@@ -10321,7 +10314,6 @@ void intel_modeset_cleanup(struct drm_device *dev)if (!crtc->fb)continue ; - intel_crtc =to_intel_crtc (crtc);intel_increase_pllclock (crtc); }
drivers/gpu/drm/i915/intel_dp.c +0 -3
@@ -2326,7 +2326,6 @@ intel_dp_start_link_train(struct intel_dp *intel_dp)struct drm_device *dev = encoder->dev;int i;uint8_t voltage; -bool clock_recovery = false;int voltage_tries, loop_tries;uint32_t DP = intel_dp->DP;
@@ -2344,7 +2343,6 @@ intel_dp_start_link_train(struct intel_dp *intel_dp) voltage =0xff ; voltage_tries =0 ; loop_tries =0 ; - clock_recovery = false;for (;;) {/* Use intel_dp->train_set[0] to set the voltage and pre emphasis values */ uint8_t link_status[DP_LINK_STATUS_SIZE ];
@@ -2365,7 +2363,6 @@ intel_dp_start_link_train(struct intel_dp *intel_dp)if (drm_dp_clock_recovery_ok (link_status, intel_dp->lane_count)) {DRM_DEBUG_KMS ("clock recovery OK\n" ); - clock_recovery = true;break ; }
drivers/gpu/drm/i915/intel_hdmi.c +0 -2
@@ -1245,7 +1245,6 @@ void intel_hdmi_init(struct drm_device *dev, int hdmi_reg, enum port port) {struct intel_digital_port *intel_dig_port;struct intel_encoder *intel_encoder; -struct drm_encoder *encoder;struct intel_connector *intel_connector; intel_dig_port =kzalloc (sizeof (struct intel_digital_port ),GFP_KERNEL );
@@ -1259,7 +1258,6 @@ void intel_hdmi_init(struct drm_device *dev, int hdmi_reg, enum port port) } intel_encoder = &intel_dig_port->base; - encoder = &intel_encoder->base;drm_encoder_init (dev, &intel_encoder->base, &intel_hdmi_enc_funcs,DRM_MODE_ENCODER_TMDS );
Signature · 1 line
1.8.1.2
Daniel Vetter
AppliedQuoted 5 lines · Paulo Zanoni
From: Paulo Zanoni <[email protected]>
Caught by "make W=1
drivers/gpu/drm/i915/".Signed-off-by Paulo Zanoni <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch