diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2010-11-19 16:58:48 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 02:03:03 -0500 |
commit | 2ad28472695a940bbda8fa1aec8286f0df8f6c4f (patch) | |
tree | c439d30c57c6b76a793176def80d3e58f3201bf1 /drivers/video/sis/init.c | |
parent | f7854e5df3f0828e942b089a82dfa5ce9baea428 (diff) |
sisfb: remove InPort/OutPort wrappers
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>
Diffstat (limited to 'drivers/video/sis/init.c')
-rw-r--r-- | drivers/video/sis/init.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/video/sis/init.c b/drivers/video/sis/init.c index 8351151e3f27..bfc6a1a8eaa2 100644 --- a/drivers/video/sis/init.c +++ b/drivers/video/sis/init.c | |||
@@ -882,51 +882,51 @@ SiS_GetModeID_VGA2(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDispl | |||
882 | void | 882 | void |
883 | SiS_SetReg(SISIOADDRESS port, unsigned short index, unsigned short data) | 883 | SiS_SetReg(SISIOADDRESS port, unsigned short index, unsigned short data) |
884 | { | 884 | { |
885 | OutPortByte(port, index); | 885 | outb((u8)index, port); |
886 | OutPortByte(port + 1, data); | 886 | outb((u8)data, port + 1); |
887 | } | 887 | } |
888 | 888 | ||
889 | void | 889 | void |
890 | SiS_SetRegByte(SISIOADDRESS port, unsigned short data) | 890 | SiS_SetRegByte(SISIOADDRESS port, unsigned short data) |
891 | { | 891 | { |
892 | OutPortByte(port, data); | 892 | outb((u8)data, port); |
893 | } | 893 | } |
894 | 894 | ||
895 | void | 895 | void |
896 | SiS_SetRegShort(SISIOADDRESS port, unsigned short data) | 896 | SiS_SetRegShort(SISIOADDRESS port, unsigned short data) |
897 | { | 897 | { |
898 | OutPortWord(port, data); | 898 | outw((u16)data, port); |
899 | } | 899 | } |
900 | 900 | ||
901 | void | 901 | void |
902 | SiS_SetRegLong(SISIOADDRESS port, unsigned int data) | 902 | SiS_SetRegLong(SISIOADDRESS port, unsigned int data) |
903 | { | 903 | { |
904 | OutPortLong(port, data); | 904 | outl((u32)data, port); |
905 | } | 905 | } |
906 | 906 | ||
907 | unsigned char | 907 | unsigned char |
908 | SiS_GetReg(SISIOADDRESS port, unsigned short index) | 908 | SiS_GetReg(SISIOADDRESS port, unsigned short index) |
909 | { | 909 | { |
910 | OutPortByte(port, index); | 910 | outb((u8)index, port); |
911 | return(InPortByte(port + 1)); | 911 | return inb(port + 1); |
912 | } | 912 | } |
913 | 913 | ||
914 | unsigned char | 914 | unsigned char |
915 | SiS_GetRegByte(SISIOADDRESS port) | 915 | SiS_GetRegByte(SISIOADDRESS port) |
916 | { | 916 | { |
917 | return(InPortByte(port)); | 917 | return inb(port); |
918 | } | 918 | } |
919 | 919 | ||
920 | unsigned short | 920 | unsigned short |
921 | SiS_GetRegShort(SISIOADDRESS port) | 921 | SiS_GetRegShort(SISIOADDRESS port) |
922 | { | 922 | { |
923 | return(InPortWord(port)); | 923 | return inw(port); |
924 | } | 924 | } |
925 | 925 | ||
926 | unsigned int | 926 | unsigned int |
927 | SiS_GetRegLong(SISIOADDRESS port) | 927 | SiS_GetRegLong(SISIOADDRESS port) |
928 | { | 928 | { |
929 | return(InPortLong(port)); | 929 | return inl(port); |
930 | } | 930 | } |
931 | 931 | ||
932 | void | 932 | void |