From patchwork Fri Nov 19 21:58:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaro Koskinen X-Patchwork-Id: 342951 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 oAJMPbJJ015027 for ; Fri, 19 Nov 2010 22:25:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757587Ab0KSWWI (ORCPT ); Fri, 19 Nov 2010 17:22:08 -0500 Received: from filtteri6.pp.htv.fi ([213.243.153.189]:59202 "EHLO filtteri6.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757552Ab0KSV6y (ORCPT ); Fri, 19 Nov 2010 16:58:54 -0500 Received: from localhost (localhost [127.0.0.1]) by filtteri6.pp.htv.fi (Postfix) with ESMTP id 9855956E1A6; Fri, 19 Nov 2010 23:58:53 +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 D7R4wyfzTJXH; Fri, 19 Nov 2010 23:58:53 +0200 (EET) Received: from localhost.localdomain (cs109108020025.pp.htv.fi [109.108.20.25]) by smtp4.welho.com (Postfix) with ESMTP id 49F165BC019; Fri, 19 Nov 2010 23:58:53 +0200 (EET) From: Aaro Koskinen To: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: thomas@winischhofer.net, aaro.koskinen@iki.fi Subject: [PATCH 7/9] sisfb: replace SiS_SetMemory with memset_io Date: Fri, 19 Nov 2010 23:58:49 +0200 Message-Id: <1290203931-25188-8-git-send-email-aaro.koskinen@iki.fi> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1290203931-25188-1-git-send-email-aaro.koskinen@iki.fi> References: <1290203931-25188-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]); Fri, 19 Nov 2010 22:25:39 +0000 (UTC) diff --git a/drivers/video/sis/init.c b/drivers/video/sis/init.c index bfc6a1a..31137ad 100644 --- a/drivers/video/sis/init.c +++ b/drivers/video/sis/init.c @@ -1578,7 +1578,7 @@ SiS_ClearBuffer(struct SiS_Private *SiS_Pr, unsigned short ModeNo) if(SiS_Pr->SiS_ModeType >= ModeEGA) { if(ModeNo > 0x13) { - SiS_SetMemory(memaddr, memsize, 0); + memset_io(memaddr, 0, memsize); } else { pBuffer = (unsigned short SISIOMEMTYPE *)memaddr; for(i = 0; i < 0x4000; i++) writew(0x0000, &pBuffer[i]); @@ -1587,7 +1587,7 @@ SiS_ClearBuffer(struct SiS_Private *SiS_Pr, unsigned short ModeNo) pBuffer = (unsigned short SISIOMEMTYPE *)memaddr; for(i = 0; i < 0x4000; i++) writew(0x0720, &pBuffer[i]); } else { - SiS_SetMemory(memaddr, 0x8000, 0); + memset_io(memaddr, 0, 0x8000); } } diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h index be7f306..af5e9a2 100644 --- a/drivers/video/sis/osdef.h +++ b/drivers/video/sis/osdef.h @@ -63,6 +63,4 @@ #warning sisfb will not work! #endif -#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize) - #endif /* _OSDEF_H_ */