diff mbox series

video: fbdev: riva: remove some unused varibles

Message ID 1604822519-65607-1-git-send-email-alex.shi@linux.alibaba.com
State New
Headers show
Series video: fbdev: riva: remove some unused varibles | expand

Commit Message

Alex Shi Nov. 8, 2020, 8:01 a.m. UTC 
Couple of variables are actually useless, remove them to save some gcc
warning:
drivers/video/fbdev/riva/riva_hw.c:250:21: warning: variable ‘mlwm’ set
but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:665:15: warning: variable ‘vraw’ set
but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:665:9: warning: variable ‘craw’ set
but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:659:73: warning: variable ‘align’ set
but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:659:50: warning: variable
‘color_key_enable’ set but not used [-Wunused-but-set-variable]

Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>

Cc: Antonino Daplas <adaplas@gmail.com> 
Cc: linux-fbdev@vger.kernel.org 
Cc: dri-devel@lists.freedesktop.org 
Cc: linux-kernel@vger.kernel.org 
---
 drivers/video/fbdev/riva/riva_hw.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

-- 
1.8.3.1

Comments

Sam Ravnborg Nov. 9, 2020, 7:31 a.m. UTC | #1 
Hi Alex,

On Sun, Nov 08, 2020 at 04:01:59PM +0800, Alex Shi wrote:
> Couple of variables are actually useless, remove them to save some gcc

> warning:

> drivers/video/fbdev/riva/riva_hw.c:250:21: warning: variable ‘mlwm’ set

> but not used [-Wunused-but-set-variable]

> drivers/video/fbdev/riva/riva_hw.c:665:15: warning: variable ‘vraw’ set

> but not used [-Wunused-but-set-variable]

> drivers/video/fbdev/riva/riva_hw.c:665:9: warning: variable ‘craw’ set

> but not used [-Wunused-but-set-variable]

> drivers/video/fbdev/riva/riva_hw.c:659:73: warning: variable ‘align’ set

> but not used [-Wunused-but-set-variable]

> drivers/video/fbdev/riva/riva_hw.c:659:50: warning: variable

> ‘color_key_enable’ set but not used [-Wunused-but-set-variable]

> 

> Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>

> Cc: Antonino Daplas <adaplas@gmail.com> 

> Cc: linux-fbdev@vger.kernel.org 

> Cc: dri-devel@lists.freedesktop.org 

> Cc: linux-kernel@vger.kernel.org 


Thanks, applied to drm-misc-next. The fix will appear in -next in a week
or so.

	Sam
diff mbox series

Patch

diff --git a/drivers/video/fbdev/riva/riva_hw.c b/drivers/video/fbdev/riva/riva_hw.c
index 4168ac464565..bcf9c4b4de31 100644
--- a/drivers/video/fbdev/riva/riva_hw.c
+++ b/drivers/video/fbdev/riva/riva_hw.c
@@ -247,14 +247,13 @@  static int nv3_iterate(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_arb_i
     int mburst_size = 32;
     int mmisses, gmisses, vmisses;
     int misses;
-    int vlwm, glwm, mlwm;
+    int vlwm, glwm;
     int last, next, cur;
     int max_gfsize ;
     long ns;
 
     vlwm = 0;
     glwm = 0;
-    mlwm = 0;
     vfsize = 0;
     gfsize = 0;
     cur = ainfo->cur;
@@ -656,13 +655,12 @@  static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar
     nv4_sim_state *arb
 )
 {
-    int data, pagemiss, cas,width, video_enable, color_key_enable, bpp, align;
+    int data, pagemiss, cas,width, video_enable, bpp;
     int nvclks, mclks, pclks, vpagemiss, crtpagemiss, vbs;
     int found, mclk_extra, mclk_loop, cbs, m1, p1;
     int mclk_freq, pclk_freq, nvclk_freq, mp_enable;
     int us_m, us_n, us_p, video_drain_rate, crtc_drain_rate;
     int vpm_us, us_video, vlwm, video_fill_us, cpm_us, us_crt,clwm;
-    int craw, vraw;
 
     fifo->valid = 1;
     pclk_freq = arb->pclk_khz;
@@ -672,9 +670,7 @@  static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar
     cas = arb->mem_latency;
     width = arb->memory_width >> 6;
     video_enable = arb->enable_video;
-    color_key_enable = arb->gr_during_vid;
     bpp = arb->pix_bpp;
-    align = arb->mem_aligned;
     mp_enable = arb->enable_mp;
     clwm = 0;
     vlwm = 0;
@@ -782,8 +778,6 @@  static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar
                 mclk_extra--;
             }
         }
-        craw = clwm;
-        vraw = vlwm;
         if (clwm < 384) clwm = 384;
         if (vlwm < 128) vlwm = 128;
         data = (int)(clwm);
@@ -842,7 +836,7 @@  static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar
     nv10_sim_state *arb
 )
 {
-    int data, pagemiss, cas,width, video_enable, color_key_enable, bpp, align;
+    int data, pagemiss, cas,width, video_enable, bpp;
     int nvclks, mclks, pclks, vpagemiss, crtpagemiss, vbs;
     int nvclk_fill, us_extra;
     int found, mclk_extra, mclk_loop, cbs, m1;
@@ -863,9 +857,7 @@  static char nv3_get_param(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_ar
     cas = arb->mem_latency;
     width = arb->memory_width/64;
     video_enable = arb->enable_video;
-    color_key_enable = arb->gr_during_vid;
     bpp = arb->pix_bpp;
-    align = arb->mem_aligned;
     mp_enable = arb->enable_mp;
     clwm = 0;
     vlwm = 1024;