From ec49ec33e22885a255855c2f820b640afbd88ef4 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Fri, 19 Nov 2010 21:58:49 +0000 Subject: sisfb: replace SiS_SetMemory with memset_io Get rid of one more wrapper. Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt --- drivers/video/sis/init.c | 4 ++-- drivers/video/sis/osdef.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/video') diff --git a/drivers/video/sis/init.c b/drivers/video/sis/init.c index bfc6a1a8eaa2..31137adc8fba 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 be7f306515a1..af5e9a29be9b 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_ */ -- cgit v1.2.1