Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

video: fbdev: riva: Fix kernel-doc and set but not used warnings

Fix W=1 warnings:
- Fix kernel-doc
- Drop unused variables/code

v2:
- Updated subject (Lee)

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Antonino Daplas <adaplas@gmail.com>
Cc: linux-fbdev@vger.kernel.org
Cc: Lee Jones <lee.jones@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20201128224114.1033617-14-sam@ravnborg.org

+12 -25
+4 -5
drivers/video/fbdev/riva/fbdev.c
··· 464 464 465 465 /** 466 466 * rivafb_load_cursor_image - load cursor image to hardware 467 - * @data: address to monochrome bitmap (1 = foreground color, 0 = background) 467 + * @data8: address to monochrome bitmap (1 = foreground color, 0 = background) 468 468 * @par: pointer to private data 469 469 * @w: width of cursor image in pixels 470 470 * @h: height of cursor image in scanlines ··· 843 843 /** 844 844 * rivafb_do_maximize - 845 845 * @info: pointer to fb_info object containing info for current riva board 846 - * @var: 847 - * @nom: 848 - * @den: 846 + * @var: standard kernel fb changeable data 847 + * @nom: nom 848 + * @den: den 849 849 * 850 850 * DESCRIPTION: 851 851 * . ··· 1214 1214 /** 1215 1215 * rivafb_pan_display 1216 1216 * @var: standard kernel fb changeable data 1217 - * @con: TODO 1218 1217 * @info: pointer to fb_info object containing info for current riva board 1219 1218 * 1220 1219 * DESCRIPTION:
+8 -20
drivers/video/fbdev/riva/riva_hw.c
··· 836 836 nv10_sim_state *arb 837 837 ) 838 838 { 839 - int data, pagemiss, cas,width, video_enable, bpp; 840 - int nvclks, mclks, pclks, vpagemiss, crtpagemiss, vbs; 841 - int nvclk_fill, us_extra; 839 + int data, pagemiss, width, video_enable, bpp; 840 + int nvclks, mclks, pclks, vpagemiss, crtpagemiss; 841 + int nvclk_fill; 842 842 int found, mclk_extra, mclk_loop, cbs, m1; 843 843 int mclk_freq, pclk_freq, nvclk_freq, mp_enable; 844 - int us_m, us_m_min, us_n, us_p, video_drain_rate, crtc_drain_rate; 845 - int vus_m, vus_n, vus_p; 846 - int vpm_us, us_video, vlwm, cpm_us, us_crt,clwm; 844 + int us_m, us_m_min, us_n, us_p, crtc_drain_rate; 845 + int vus_m; 846 + int vpm_us, us_video, cpm_us, us_crt,clwm; 847 847 int clwm_rnd_down; 848 - int craw, m2us, us_pipe, us_pipe_min, vus_pipe, p1clk, p2; 849 - int pclks_2_top_fifo, min_mclk_extra; 848 + int m2us, us_pipe_min, p1clk, p2; 849 + int min_mclk_extra; 850 850 int us_min_mclk_extra; 851 851 852 852 fifo->valid = 1; ··· 854 854 mclk_freq = arb->mclk_khz; 855 855 nvclk_freq = arb->nvclk_khz; 856 856 pagemiss = arb->mem_page_miss; 857 - cas = arb->mem_latency; 858 857 width = arb->memory_width/64; 859 858 video_enable = arb->enable_video; 860 859 bpp = arb->pix_bpp; 861 860 mp_enable = arb->enable_mp; 862 861 clwm = 0; 863 - vlwm = 1024; 864 862 865 863 cbs = 512; 866 - vbs = 512; 867 864 868 865 pclks = 4; /* lwm detect. */ 869 866 ··· 921 924 us_min_mclk_extra = min_mclk_extra *1000*1000 / mclk_freq; 922 925 us_n = nvclks*1000*1000 / nvclk_freq;/* nvclk latency in us */ 923 926 us_p = pclks*1000*1000 / pclk_freq;/* nvclk latency in us */ 924 - us_pipe = us_m + us_n + us_p; 925 927 us_pipe_min = us_m_min + us_n + us_p; 926 - us_extra = 0; 927 928 928 929 vus_m = mclk_loop *1000*1000 / mclk_freq; /* Mclk latency in us */ 929 - vus_n = (4)*1000*1000 / nvclk_freq;/* nvclk latency in us */ 930 - vus_p = 0*1000*1000 / pclk_freq;/* pclk latency in us */ 931 - vus_pipe = vus_m + vus_n + vus_p; 932 930 933 931 if(video_enable) { 934 - video_drain_rate = pclk_freq * 4; /* MB/s */ 935 932 crtc_drain_rate = pclk_freq * bpp/8; /* MB/s */ 936 933 937 934 vpagemiss = 1; /* self generating page miss */ ··· 984 993 else if(crtc_drain_rate * 100 >= nvclk_fill * 98) { 985 994 clwm = 1024; 986 995 cbs = 512; 987 - us_extra = (cbs * 1000 * 1000)/ (8*width)/mclk_freq ; 988 996 } 989 997 } 990 998 } ··· 1000 1010 1001 1011 m1 = clwm + cbs - 1024; /* Amount of overfill */ 1002 1012 m2us = us_pipe_min + us_min_mclk_extra; 1003 - pclks_2_top_fifo = (1024-clwm)/(8*width); 1004 1013 1005 1014 /* pclk cycles to drain */ 1006 1015 p1clk = m2us * pclk_freq/(1000*1000); ··· 1027 1038 min_mclk_extra--; 1028 1039 } 1029 1040 } 1030 - craw = clwm; 1031 1041 1032 1042 if(clwm < (1024-cbs+8)) clwm = 1024-cbs+8; 1033 1043 data = (int)(clwm);