From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-sn1nam02on0103.outbound.protection.outlook.com ([104.47.36.103]:11220 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032278AbeCAPi0 (ORCPT ); Thu, 1 Mar 2018 10:38:26 -0500 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Sudip Mukherjee , Sudip Mukherjee , Tomi Valkeinen , Sasha Levin Subject: [added to the 4.1 stable tree] video: fbdev: sis: remove unused variable Date: Thu, 1 Mar 2018 15:27:19 +0000 Message-ID: <20180301152116.1486-451-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Sudip Mukherjee This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D [ Upstream commit 32ad61951574d011d363694d6037592e99da9421 ] The variables modeflag and resinfo were only assigned some value but were never used. Signed-off-by: Sudip Mukherjee Signed-off-by: Tomi Valkeinen Signed-off-by: Sasha Levin --- drivers/video/fbdev/sis/init301.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/video/fbdev/sis/init301.c b/drivers/video/fbdev/sis/in= it301.c index 295e0dedaf1f..20f7234e809e 100644 --- a/drivers/video/fbdev/sis/init301.c +++ b/drivers/video/fbdev/sis/init301.c @@ -2151,17 +2151,15 @@ SiS_GetVCLK2Ptr(struct SiS_Private *SiS_Pr, unsigne= d short ModeNo, unsigned shor unsigned short RefreshRateTableIndex) { unsigned short CRT2Index, VCLKIndex =3D 0, VCLKIndexGEN =3D 0, VCLKIndex= GENCRT =3D 0; - unsigned short modeflag, resinfo, tempbx; + unsigned short resinfo, tempbx; const unsigned char *CHTVVCLKPtr =3D NULL; =20 if(ModeNo <=3D 0x13) { - modeflag =3D SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag; resinfo =3D SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo; CRT2Index =3D SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_CRT2CRTC; VCLKIndexGEN =3D (SiS_GetRegByte((SiS_Pr->SiS_P3ca+0x02)) >> 2) & 0x0= 3; VCLKIndexGENCRT =3D VCLKIndexGEN; } else { - modeflag =3D SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag; resinfo =3D SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO; CRT2Index =3D SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRT2CRT= C; VCLKIndexGEN =3D SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRTV= CLK; @@ -7270,7 +7268,7 @@ SiS_ShiftXPos(struct SiS_Private *SiS_Pr, int shift) static void SiS_SetGroup4_C_ELV(struct SiS_Private *SiS_Pr, unsigned short ModeNo, uns= igned short ModeIdIndex) { - unsigned short temp, temp1, resinfo =3D 0; + unsigned short temp, temp1; unsigned char *ROMAddr =3D SiS_Pr->VirtualRomBase; =20 if(!(SiS_Pr->SiS_VBType & VB_SIS30xCLV)) return; @@ -7282,10 +7280,6 @@ SiS_SetGroup4_C_ELV(struct SiS_Private *SiS_Pr, unsi= gned short ModeNo, unsigned if(!(ROMAddr[0x61] & 0x04)) return; } =20 - if(ModeNo > 0x13) { - resinfo =3D SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO; - } - SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x3a,0x08); temp =3D SiS_GetReg(SiS_Pr->SiS_Part4Port,0x3a); if(!(temp & 0x01)) { --=20 2.14.1