[PATCH 7/9] sisfb: replace SiS_SetMemory with memset_io

From: Aaro Koskinen
Date: Fri Nov 19 2010 - 17:22:12 EST


Get rid of one more wrapper.

Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
---
drivers/video/sis/init.c | 4 ++--
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 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_ */
--
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/