Skip to content

Commit

Permalink
sisfb: replace SiS_SetMemory with memset_io
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Aaro Koskinen authored and Paul Mundt committed Nov 24, 2010
1 parent 2ad2847 commit ec49ec3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/video/sis/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand All @@ -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);
}
}

Expand Down
2 changes: 0 additions & 2 deletions drivers/video/sis/osdef.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,4 @@
#warning sisfb will not work!
#endif

#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize)

#endif /* _OSDEF_H_ */

0 comments on commit ec49ec3

Please sign in to comment.