korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-03 00:54:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

sisfb: remove InPort/OutPort wrappers

Browse Source 
Remove register IO wrappers.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Aaro Koskinen 2010-11-19 21:58:48 +00:00 committed by Paul Mundt
parent f7854e5df3
commit 2ad2847269
2 changed files with 10 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/video/sis/init.c
View File

@ -882,51 +882,51 @@ SiS_GetModeID_VGA2(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDispl
void void
SiS_SetReg(SISIOADDRESS port, unsigned short index, unsigned short data) SiS_SetReg(SISIOADDRESS port, unsigned short index, unsigned short data)
{ {
OutPortByte(port, index); outb((u8)index, port);
OutPortByte(port + 1, data); outb((u8)data, port + 1);
} }
void void
SiS_SetRegByte(SISIOADDRESS port, unsigned short data) SiS_SetRegByte(SISIOADDRESS port, unsigned short data)
{ {
OutPortByte(port, data); outb((u8)data, port);
} }
void void
SiS_SetRegShort(SISIOADDRESS port, unsigned short data) SiS_SetRegShort(SISIOADDRESS port, unsigned short data)
{ {
OutPortWord(port, data); outw((u16)data, port);
} }
void void
SiS_SetRegLong(SISIOADDRESS port, unsigned int data) SiS_SetRegLong(SISIOADDRESS port, unsigned int data)
{ {
OutPortLong(port, data); outl((u32)data, port);
} }
unsigned char unsigned char
SiS_GetReg(SISIOADDRESS port, unsigned short index) SiS_GetReg(SISIOADDRESS port, unsigned short index)
{ {
OutPortByte(port, index); outb((u8)index, port);
return(InPortByte(port + 1)); return inb(port + 1);
} }
unsigned char unsigned char
SiS_GetRegByte(SISIOADDRESS port) SiS_GetRegByte(SISIOADDRESS port)
{ {
return(InPortByte(port)); return inb(port);
} }
unsigned short unsigned short
SiS_GetRegShort(SISIOADDRESS port) SiS_GetRegShort(SISIOADDRESS port)
{ {
return(InPortWord(port)); return inw(port);
} }
unsigned int unsigned int
SiS_GetRegLong(SISIOADDRESS port) SiS_GetRegLong(SISIOADDRESS port)
{ {
return(InPortLong(port)); return inl(port);
} }
void void

30
drivers/video/sis/osdef.h
View File

@ -54,30 +54,6 @@
#ifndef _SIS_OSDEF_H_ #ifndef _SIS_OSDEF_H_
#define _SIS_OSDEF_H_ #define _SIS_OSDEF_H_
#ifdef OutPortByte
#undef OutPortByte
#endif
#ifdef OutPortWord
#undef OutPortWord
#endif
#ifdef OutPortLong
#undef OutPortLong
#endif
#ifdef InPortByte
#undef InPortByte
#endif
#ifdef InPortWord
#undef InPortWord
#endif
#ifdef InPortLong
#undef InPortLong
#endif
/**********************************************************************/ /**********************************************************************/
/* LINUX KERNEL */ /* LINUX KERNEL */
/**********************************************************************/ /**********************************************************************/
@ -87,12 +63,6 @@
#warning sisfb will not work! #warning sisfb will not work!
#endif #endif
#define OutPortByte(p,v) outb((u8)(v),(SISIOADDRESS)(p))
#define OutPortWord(p,v) outw((u16)(v),(SISIOADDRESS)(p))
#define OutPortLong(p,v) outl((u32)(v),(SISIOADDRESS)(p))
#define InPortByte(p) inb((SISIOADDRESS)(p))
#define InPortWord(p) inw((SISIOADDRESS)(p))
#define InPortLong(p) inl((SISIOADDRESS)(p))
#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize) #define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize)
#endif /* _OSDEF_H_ */ #endif /* _OSDEF_H_ */