diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2010-11-19 21:58:49 +0000 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 16:03:09 +0900 |
commit | ec49ec33e22885a255855c2f820b640afbd88ef4 (patch) | |
tree | 5651a81edd47e0d0c08b9e6dcbd08c12b9c773cd /drivers/video | |
parent | 2ad28472695a940bbda8fa1aec8286f0df8f6c4f (diff) | |
download | linux-3.10-ec49ec33e22885a255855c2f820b640afbd88ef4.tar.gz linux-3.10-ec49ec33e22885a255855c2f820b640afbd88ef4.tar.bz2 linux-3.10-ec49ec33e22885a255855c2f820b640afbd88ef4.zip |
sisfb: replace SiS_SetMemory with memset_io
Get rid of one more wrapper.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/sis/init.c | 4 | ||||
-rw-r--r-- | drivers/video/sis/osdef.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/sis/init.c b/drivers/video/sis/init.c index bfc6a1a8eaa..31137adc8fb 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 be7f306515a..af5e9a29be9 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_ */ |