diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2010-11-19 16:58:49 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 02:03:09 -0500 |
commit | ec49ec33e22885a255855c2f820b640afbd88ef4 (patch) | |
tree | 5651a81edd47e0d0c08b9e6dcbd08c12b9c773cd /drivers/video/sis | |
parent | 2ad28472695a940bbda8fa1aec8286f0df8f6c4f (diff) |
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/sis')
-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 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) | |||
1578 | 1578 | ||
1579 | if(SiS_Pr->SiS_ModeType >= ModeEGA) { | 1579 | if(SiS_Pr->SiS_ModeType >= ModeEGA) { |
1580 | if(ModeNo > 0x13) { | 1580 | if(ModeNo > 0x13) { |
1581 | SiS_SetMemory(memaddr, memsize, 0); | 1581 | memset_io(memaddr, 0, memsize); |
1582 | } else { | 1582 | } else { |
1583 | pBuffer = (unsigned short SISIOMEMTYPE *)memaddr; | 1583 | pBuffer = (unsigned short SISIOMEMTYPE *)memaddr; |
1584 | for(i = 0; i < 0x4000; i++) writew(0x0000, &pBuffer[i]); | 1584 | for(i = 0; i < 0x4000; i++) writew(0x0000, &pBuffer[i]); |
@@ -1587,7 +1587,7 @@ SiS_ClearBuffer(struct SiS_Private *SiS_Pr, unsigned short ModeNo) | |||
1587 | pBuffer = (unsigned short SISIOMEMTYPE *)memaddr; | 1587 | pBuffer = (unsigned short SISIOMEMTYPE *)memaddr; |
1588 | for(i = 0; i < 0x4000; i++) writew(0x0720, &pBuffer[i]); | 1588 | for(i = 0; i < 0x4000; i++) writew(0x0720, &pBuffer[i]); |
1589 | } else { | 1589 | } else { |
1590 | SiS_SetMemory(memaddr, 0x8000, 0); | 1590 | memset_io(memaddr, 0, 0x8000); |
1591 | } | 1591 | } |
1592 | } | 1592 | } |
1593 | 1593 | ||
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 @@ | |||
63 | #warning sisfb will not work! | 63 | #warning sisfb will not work! |
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | #define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize) | ||
67 | |||
68 | #endif /* _OSDEF_H_ */ | 66 | #endif /* _OSDEF_H_ */ |