From patchwork Mon Dec 20 21:50:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaro Koskinen X-Patchwork-Id: 422651 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBL0RA9o011307 for ; Tue, 21 Dec 2010 00:31:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757949Ab0LTVuy (ORCPT ); Mon, 20 Dec 2010 16:50:54 -0500 Received: from filtteri6.pp.htv.fi ([213.243.153.189]:54130 "EHLO filtteri6.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758064Ab0LTVuI (ORCPT ); Mon, 20 Dec 2010 16:50:08 -0500 Received: from localhost (localhost [127.0.0.1]) by filtteri6.pp.htv.fi (Postfix) with ESMTP id 20CB156E1CC; Mon, 20 Dec 2010 23:50:07 +0200 (EET) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp4.welho.com ([213.243.153.38]) by localhost (filtteri6.pp.htv.fi [213.243.153.189]) (amavisd-new, port 10024) with ESMTP id 9yt2h1mz5XUn; Mon, 20 Dec 2010 23:50:04 +0200 (EET) Received: from localhost.localdomain (cs109108020025.pp.htv.fi [109.108.20.25]) by smtp4.welho.com (Postfix) with ESMTP id 2657A5BC010; Mon, 20 Dec 2010 23:50:04 +0200 (EET) From: Aaro Koskinen To: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas@winischhofer.net Cc: aaro.koskinen@iki.fi Subject: [PATCH 13/13] sisfb: eliminate compiler warnings Date: Mon, 20 Dec 2010 23:50:22 +0200 Message-Id: <1292881822-32630-14-git-send-email-aaro.koskinen@iki.fi> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1292881822-32630-1-git-send-email-aaro.koskinen@iki.fi> References: <1292881822-32630-1-git-send-email-aaro.koskinen@iki.fi> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 21 Dec 2010 00:31:25 +0000 (UTC) diff --git a/drivers/video/sis/init301.c b/drivers/video/sis/init301.c index e24c5ca..a89e3ca 100644 --- a/drivers/video/sis/init301.c +++ b/drivers/video/sis/init301.c @@ -5852,7 +5852,7 @@ SiS_SetGroup1_LVDS(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned s temp = tempax & 0x00FF; SiS_SetReg(SiS_Pr->SiS_Part1Port,0x43,temp); temp = ((tempax & 0xFF00) >> 8) << 3; - SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x44,~0x0F8,temp); + SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port, 0x44, 0x07, temp); tempax = SiS_Pr->SiS_VDE; /* BDxWadrst1 = BDxWadrst0 + BDxWadroff * VDE */ if(SiS_Pr->SiS_LCDResInfo == Panel_320x240_1 || @@ -5866,7 +5866,7 @@ SiS_SetGroup1_LVDS(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned s temp = ((tempeax & 0xFF0000) >> 16) | 0x10; SiS_SetReg(SiS_Pr->SiS_Part1Port,0x40,temp); temp = ((tempeax & 0x01000000) >> 24) << 7; - SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x3C,~0x080,temp); + SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port, 0x3C, 0x7F, temp); SiS_SetReg(SiS_Pr->SiS_Part1Port,0x2F,0x03); SiS_SetReg(SiS_Pr->SiS_Part1Port,0x03,0x50); diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index 793216b..2fb8c5a 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c @@ -3855,7 +3855,7 @@ sisfb_post_setmode(struct sis_video_info *ivideo) reg1 = 0x00; } SiS_SetRegANDOR(SISCR, ivideo->SiS_Pr.SiS_MyCR63, ~0x40, reg); - SiS_SetRegANDOR(SISSR, 0x1f, ~0xc0, reg1); + SiS_SetRegANDOR(SISSR, 0x1f, 0x3f, reg1); } #endif