From: Sam Ravnborg <sam@ravnborg.org> To: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Lee Jones <lee.jones@linaro.org> Cc: Aditya Pakki <pakki001@umn.edu>, Alexander Klimov <grandmaster@al2klimov.de>, Alex Dewar <alex.dewar90@gmail.com>, Antonino Daplas <adaplas@gmail.com>, Arnd Bergmann <arnd@arndb.de>, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Daniel Vetter <daniel.vetter@ffwll.ch>, Evgeny Novikov <novikov@ispras.ru>, Ferenc Bakonyi <fero@drama.obuda.kando.hu>, Florian Tobias Schandinat <FlorianSchandinat@gmx.de>, George Kennedy <george.kennedy@oracle.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Gustavo Silva <gustavoars@kernel.org>, Jani Nikula <jani.nikula@intel.com>, Jason Yan <yanaijie@huawei.com>, Jingoo Han <jingoohan1@gmail.com>, Jiri Slaby <jirislaby@kernel.org>, Joe Perches <joe@perches.com>, Kristoffer Ericson <kristoffer.ericson@gmail.com>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, linux-nvidia@lists.surfsouth.com, Michal Januszewski <spock@gentoo.org>, Mike Rapoport <rppt@kernel.org>, Nathan Chancellor <natechancellor@gmail.com>, Peilin Ye <yepeilin.cs@gmail.com>, Peter Rosin <peda@axentia.se>, Qilong Zhang <zhangqilong3@huawei.com>, Randy Dunlap <rdunlap@infradead.org>, Saeed Mirzamohammadi <saeed.mirzamohammadi@oracle.com>, Sam Ravnborg <sam@ravnborg.org>, Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>, Thomas Winischhofer <thomas@winischhofer.net>, Thomas Zimemrmann <tzimmermann@suse.de>, Vaibhav Gupta <vaibhavgupta40@gmail.com>, Xiaofei Tan <tanxiaofei@huawei.com> Subject: [PATCH v1 13/28] video: fbdev: riva: Fix W=1 warnings Date: Fri, 27 Nov 2020 20:58:10 +0100 Message-ID: <20201127195825.858960-14-sam@ravnborg.org> (raw) In-Reply-To: <20201127195825.858960-1-sam@ravnborg.org> Fix W=1 warnings: - Fix kernel-doc - Drop unused variables/code Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Antonino Daplas <adaplas@gmail.com> Cc: linux-fbdev@vger.kernel.org --- drivers/video/fbdev/riva/fbdev.c | 9 ++++----- drivers/video/fbdev/riva/riva_hw.c | 28 ++++++++-------------------- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/drivers/video/fbdev/riva/fbdev.c b/drivers/video/fbdev/riva/fbdev.c index ce55b9d2e862..55554b0433cb 100644 --- a/drivers/video/fbdev/riva/fbdev.c +++ b/drivers/video/fbdev/riva/fbdev.c @@ -464,7 +464,7 @@ static inline void reverse_order(u32 *l) /** * rivafb_load_cursor_image - load cursor image to hardware - * @data: address to monochrome bitmap (1 = foreground color, 0 = background) + * @data8: address to monochrome bitmap (1 = foreground color, 0 = background) * @par: pointer to private data * @w: width of cursor image in pixels * @h: height of cursor image in scanlines @@ -843,9 +843,9 @@ static void riva_update_var(struct fb_var_screeninfo *var, /** * rivafb_do_maximize - * @info: pointer to fb_info object containing info for current riva board - * @var: - * @nom: - * @den: + * @var: standard kernel fb changeable data + * @nom: nom + * @den: den * * DESCRIPTION: * . @@ -1214,7 +1214,6 @@ static int rivafb_set_par(struct fb_info *info) /** * rivafb_pan_display * @var: standard kernel fb changeable data - * @con: TODO * @info: pointer to fb_info object containing info for current riva board * * DESCRIPTION: diff --git a/drivers/video/fbdev/riva/riva_hw.c b/drivers/video/fbdev/riva/riva_hw.c index bcf9c4b4de31..8b829b720064 100644 --- a/drivers/video/fbdev/riva/riva_hw.c +++ b/drivers/video/fbdev/riva/riva_hw.c @@ -836,17 +836,17 @@ static void nv10CalcArbitration nv10_sim_state *arb ) { - int data, pagemiss, cas,width, video_enable, bpp; - int nvclks, mclks, pclks, vpagemiss, crtpagemiss, vbs; - int nvclk_fill, us_extra; + int data, pagemiss, width, video_enable, bpp; + int nvclks, mclks, pclks, vpagemiss, crtpagemiss; + int nvclk_fill; 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, video_drain_rate, crtc_drain_rate; - int vus_m, vus_n, vus_p; - int vpm_us, us_video, vlwm, cpm_us, us_crt,clwm; + int us_m, us_m_min, us_n, us_p, crtc_drain_rate; + int vus_m; + int vpm_us, us_video, cpm_us, us_crt,clwm; int clwm_rnd_down; - int craw, m2us, us_pipe, us_pipe_min, vus_pipe, p1clk, p2; - int pclks_2_top_fifo, min_mclk_extra; + int m2us, us_pipe_min, p1clk, p2; + int min_mclk_extra; int us_min_mclk_extra; fifo->valid = 1; @@ -854,16 +854,13 @@ static void nv10CalcArbitration mclk_freq = arb->mclk_khz; nvclk_freq = arb->nvclk_khz; pagemiss = arb->mem_page_miss; - cas = arb->mem_latency; width = arb->memory_width/64; video_enable = arb->enable_video; bpp = arb->pix_bpp; mp_enable = arb->enable_mp; clwm = 0; - vlwm = 1024; cbs = 512; - vbs = 512; pclks = 4; /* lwm detect. */ @@ -924,17 +921,11 @@ static void nv10CalcArbitration us_min_mclk_extra = min_mclk_extra *1000*1000 / mclk_freq; us_n = nvclks*1000*1000 / nvclk_freq;/* nvclk latency in us */ us_p = pclks*1000*1000 / pclk_freq;/* nvclk latency in us */ - us_pipe = us_m + us_n + us_p; us_pipe_min = us_m_min + us_n + us_p; - us_extra = 0; 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 */ - vus_pipe = vus_m + vus_n + vus_p; if(video_enable) { - video_drain_rate = pclk_freq * 4; /* MB/s */ crtc_drain_rate = pclk_freq * bpp/8; /* MB/s */ vpagemiss = 1; /* self generating page miss */ @@ -993,7 +984,6 @@ static void nv10CalcArbitration else if(crtc_drain_rate * 100 >= nvclk_fill * 98) { clwm = 1024; cbs = 512; - us_extra = (cbs * 1000 * 1000)/ (8*width)/mclk_freq ; } } } @@ -1010,7 +1000,6 @@ static void nv10CalcArbitration m1 = clwm + cbs - 1024; /* Amount of overfill */ m2us = us_pipe_min + us_min_mclk_extra; - pclks_2_top_fifo = (1024-clwm)/(8*width); /* pclk cycles to drain */ p1clk = m2us * pclk_freq/(1000*1000); @@ -1038,7 +1027,6 @@ static void nv10CalcArbitration min_mclk_extra--; } } - craw = clwm; if(clwm < (1024-cbs+8)) clwm = 1024-cbs+8; data = (int)(clwm); -- 2.27.0
next prev parent reply index Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-27 19:57 [PATCH v1 0/28] drivers/video: W=1 warning fixes Sam Ravnborg 2020-11-27 19:57 ` [PATCH v1 01/28] video: Fix W=1 warnings in of_videomode + of_display_timing Sam Ravnborg 2020-11-28 8:28 ` Lee Jones 2020-11-28 15:15 ` Sam Ravnborg 2020-11-27 19:57 ` [PATCH v1 02/28] video: fbcon: Use pr_debug() in fbcon Sam Ravnborg 2020-11-27 21:16 ` Joe Perches 2020-11-27 22:36 ` Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 03/28] video: fbdev: core: Fix W=1 warnings in fbmon + fb_notify Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 04/28] video: fbdev: aty: Delete unused variable in radeon_monitor Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 06/28] video: fbdev: aty: Fix W=1 warnings in mach64_ct Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 07/28] video: fbdev: sis: Fix W=1 warnings about static symbols Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 08/28] video: fbdev: sis: Fix W=1 warning about SiS_TVDelay Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 09/28] video: fbdev: sis: Fix W=1 warnings in init.c Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 10/28] video: fbdev: sis: Fix W=1 warnings in sis_main Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 11/28] video: fbdev: via: Fix W=1 warnings Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 12/28] video: fbdev: tdfx: " Sam Ravnborg 2020-11-27 19:58 ` Sam Ravnborg [this message] 2020-11-27 19:58 ` [PATCH v1 14/28] video: fbdev: pm2fb: " Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 15/28] video: fbdev: neofb: " Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 16/28] video: fbdev: hgafb: " Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 17/28] video: fbdev: tgafb: " Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 18/28] video: fbdev: mx3fb: " Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 19/28] video: fbdev: sstfb: " Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 20/28] video: fbdev: nvidia: " Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 21/28] video: fbdev: tmiofb: " Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 22/28] video: fbdev: omapfb: Fix W=1 warnings in dsi Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 23/28] video: fbdev: omapfb: Fix W=1 warnings in hdmi*_core Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 24/28] video: fbdev: s3c-fb: Fix W=1 warnings Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 25/28] video: fbdev: uvesafb: Fix W=1 warning Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 26/28] video: fbdev: uvesafb: Fix W=1 string related warnings Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 27/28] video: fbdev: cirrusfb: Fix W=1 warnings Sam Ravnborg 2020-11-27 19:58 ` [PATCH v1 28/28] video: fbdev: s1d13xxxfb: " Sam Ravnborg 2020-11-27 19:58 [PATCH v1 05/28] video: fbdev: aty: Fix W=1 warnings in atyfb_base Sam Ravnborg 2020-11-27 23:29 ` kernel test robot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201127195825.858960-14-sam@ravnborg.org \ --to=sam@ravnborg.org \ --cc=FlorianSchandinat@gmx.de \ --cc=adaplas@gmail.com \ --cc=alex.dewar90@gmail.com \ --cc=arnd@arndb.de \ --cc=b.zolnierkie@samsung.com \ --cc=benh@kernel.crashing.org \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=fero@drama.obuda.kando.hu \ --cc=george.kennedy@oracle.com \ --cc=grandmaster@al2klimov.de \ --cc=gregkh@linuxfoundation.org \ --cc=gustavoars@kernel.org \ --cc=jani.nikula@intel.com \ --cc=jingoohan1@gmail.com \ --cc=jirislaby@kernel.org \ --cc=joe@perches.com \ --cc=kristoffer.ericson@gmail.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=lee.jones@linaro.org \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-nvidia@lists.surfsouth.com \ --cc=natechancellor@gmail.com \ --cc=novikov@ispras.ru \ --cc=pakki001@umn.edu \ --cc=peda@axentia.se \ --cc=penguin-kernel@I-love.SAKURA.ne.jp \ --cc=rdunlap@infradead.org \ --cc=rppt@kernel.org \ --cc=saeed.mirzamohammadi@oracle.com \ --cc=spock@gentoo.org \ --cc=tanxiaofei@huawei.com \ --cc=thomas@winischhofer.net \ --cc=tzimmermann@suse.de \ --cc=vaibhavgupta40@gmail.com \ --cc=yanaijie@huawei.com \ --cc=yepeilin.cs@gmail.com \ --cc=zhangqilong3@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-fbdev Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-fbdev/0 linux-fbdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-fbdev linux-fbdev/ https://lore.kernel.org/linux-fbdev \ linux-fbdev@vger.kernel.org public-inbox-index linux-fbdev Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-fbdev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git