Fixes the following W=1 kernel build warning(s):

 drivers/video/fbdev/riva/riva_hw.c: In function ‘nv10CalcArbitration’:
 drivers/video/fbdev/riva/riva_hw.c:845:23: warning: variable ‘vus_p’ set but 
not used [-Wunused-but-set-variable]
 drivers/video/fbdev/riva/riva_hw.c:845:16: warning: variable ‘vus_n’ set but 
not used [-Wunused-but-set-variable]

Cc: Antonino Daplas <adap...@gmail.com>
Cc: Jeff Garzik <jgar...@pobox.com>
Cc: linux-fb...@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jo...@linaro.org>
---
 drivers/video/fbdev/riva/riva_hw.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/video/fbdev/riva/riva_hw.c 
b/drivers/video/fbdev/riva/riva_hw.c
index 4ee63f7d84d3e..2bc510c24aa9e 100644
--- a/drivers/video/fbdev/riva/riva_hw.c
+++ b/drivers/video/fbdev/riva/riva_hw.c
@@ -842,7 +842,7 @@ static void nv10CalcArbitration
     int found, mclk_extra, mclk_loop, cbs, m1;
     int mclk_freq, pclk_freq, nvclk_freq, mp_enable;
     int us_m, us_m_min, us_n, us_p, crtc_drain_rate;
-    int vus_m, vus_n, vus_p;
+    int vus_m;
     int vpm_us, us_video, cpm_us, us_crt,clwm;
     int clwm_rnd_down;
     int m2us, us_pipe_min, p1clk, p2;
@@ -924,8 +924,6 @@ static void nv10CalcArbitration
       us_pipe_min = us_m_min + us_n + us_p;
 
       vus_m = mclk_loop *1000*1000 / mclk_freq; /* Mclk latency in us */
-      vus_n = (4)*1000*1000 / nvclk_freq;/* nvclk latency in us */
-      vus_p = 0*1000*1000 / pclk_freq;/* pclk latency in us */
 
       if(video_enable) {
         crtc_drain_rate = pclk_freq * bpp/8; /* MB/s */
-- 
2.25.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to