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 09/28] video: fbdev: sis: Fix W=1 warnings in init.c
Date: Fri, 27 Nov 2020 20:58:06 +0100 [thread overview]
Message-ID: <20201127195825.858960-10-sam@ravnborg.org> (raw)
In-Reply-To: <20201127195825.858960-1-sam@ravnborg.org>
Fix several W=1 warnings.
This removes a lot of unused code - which is always a good thing to do.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
---
drivers/video/fbdev/sis/init.c | 34 ++++++----------------------------
1 file changed, 6 insertions(+), 28 deletions(-)
diff --git a/drivers/video/fbdev/sis/init.c b/drivers/video/fbdev/sis/init.c
index fde27feae5d0..b77ea1a8825a 100644
--- a/drivers/video/fbdev/sis/init.c
+++ b/drivers/video/fbdev/sis/init.c
@@ -2648,7 +2648,7 @@ static void
SiS_SetCRT1ModeRegs(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
unsigned short ModeIdIndex, unsigned short RRTI)
{
- unsigned short data, infoflag = 0, modeflag, resindex;
+ unsigned short data, infoflag = 0, modeflag;
#ifdef CONFIG_FB_SIS_315
unsigned char *ROMAddr = SiS_Pr->VirtualRomBase;
unsigned short data2, data3;
@@ -2659,7 +2659,7 @@ SiS_SetCRT1ModeRegs(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
if(SiS_Pr->UseCustomMode) {
infoflag = SiS_Pr->CInfoFlag;
} else {
- resindex = SiS_GetResInfo(SiS_Pr, ModeNo, ModeIdIndex);
+ SiS_GetResInfo(SiS_Pr, ModeNo, ModeIdIndex);
if(ModeNo > 0x13) {
infoflag = SiS_Pr->SiS_RefIndex[RRTI].Ext_InfoFlag;
}
@@ -3538,17 +3538,13 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
struct fb_var_screeninfo *var, bool writeres
)
{
- unsigned short HRE, HBE, HRS, HBS, HDE, HT;
- unsigned short VRE, VBE, VRS, VBS, VDE, VT;
- unsigned char sr_data, cr_data, cr_data2;
- int A, B, C, D, E, F, temp;
+ unsigned short HRE, HBE, HRS, HDE;
+ unsigned short VRE, VBE, VRS, VDE;
+ unsigned char sr_data, cr_data;
+ int B, C, D, E, F, temp;
sr_data = crdata[14];
- /* Horizontal total */
- HT = crdata[0] | ((unsigned short)(sr_data & 0x03) << 8);
- A = HT + 5;
-
/* Horizontal display enable end */
HDE = crdata[1] | ((unsigned short)(sr_data & 0x0C) << 6);
E = HDE + 1;
@@ -3557,9 +3553,6 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
HRS = crdata[4] | ((unsigned short)(sr_data & 0xC0) << 2);
F = HRS - E - 3;
- /* Horizontal blank start */
- HBS = crdata[2] | ((unsigned short)(sr_data & 0x30) << 4);
-
sr_data = crdata[15];
cr_data = crdata[5];
@@ -3588,13 +3581,6 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
sr_data = crdata[13];
cr_data = crdata[7];
- /* Vertical total */
- VT = crdata[6] |
- ((unsigned short)(cr_data & 0x01) << 8) |
- ((unsigned short)(cr_data & 0x20) << 4) |
- ((unsigned short)(sr_data & 0x01) << 10);
- A = VT + 2;
-
/* Vertical display enable end */
VDE = crdata[10] |
((unsigned short)(cr_data & 0x02) << 7) |
@@ -3609,14 +3595,6 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
((unsigned short)(sr_data & 0x08) << 7);
F = VRS + 1 - E;
- cr_data2 = (crdata[16] & 0x01) << 5;
-
- /* Vertical blank start */
- VBS = crdata[11] |
- ((unsigned short)(cr_data & 0x08) << 5) |
- ((unsigned short)(cr_data2 & 0x20) << 4) |
- ((unsigned short)(sr_data & 0x04) << 8);
-
/* Vertical blank end */
VBE = crdata[12] | ((unsigned short)(sr_data & 0x10) << 4);
temp = VBE - ((E - 1) & 511);
--
2.27.0
next prev parent reply other threads:[~2020-11-28 2:28 UTC|newest]
Thread overview: 34+ 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 05/28] video: fbdev: aty: Fix W=1 warnings in atyfb_base Sam Ravnborg
2020-11-27 23:29 ` kernel test robot
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 ` Sam Ravnborg [this message]
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 ` [PATCH v1 13/28] video: fbdev: riva: " Sam Ravnborg
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
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-10-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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).