summaryrefslogtreecommitdiff
path: root/drivers/staging/xgifb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/xgifb')
-rw-r--r--drivers/staging/xgifb/XGI_accel.c1
-rw-r--r--drivers/staging/xgifb/XGI_main_26.c2
-rw-r--r--drivers/staging/xgifb/osdef.h37
-rw-r--r--drivers/staging/xgifb/vb_ext.c2
-rw-r--r--drivers/staging/xgifb/vb_init.c1
-rw-r--r--drivers/staging/xgifb/vb_setmode.c4
-rw-r--r--drivers/staging/xgifb/vb_util.c18
-rw-r--r--drivers/staging/xgifb/vgatypes.h2
8 files changed, 8 insertions, 59 deletions
diff --git a/drivers/staging/xgifb/XGI_accel.c b/drivers/staging/xgifb/XGI_accel.c
index 24f454d93772..85af55c32091 100644
--- a/drivers/staging/xgifb/XGI_accel.c
+++ b/drivers/staging/xgifb/XGI_accel.c
@@ -43,7 +43,6 @@
#include <asm/mtrr.h>
#endif
-#include "osdef.h"
#include "vgatypes.h"
#include "vb_struct.h"
#include "XGIfb.h"
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index e9551d347a88..c7ad6cdffff9 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -29,8 +29,6 @@
#include <linux/types.h>
#include <linux/proc_fs.h>
-#include "osdef.h"
-
#ifndef XGIFB_PAN
#define XGIFB_PAN
diff --git a/drivers/staging/xgifb/osdef.h b/drivers/staging/xgifb/osdef.h
deleted file mode 100644
index 7d05ea47c72f..000000000000
--- a/drivers/staging/xgifb/osdef.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _OSDEF_H_
-#define _OSDEF_H_
-
-/**********************************************************************/
-
-#ifdef OutPortByte
-#undef OutPortByte
-#endif /* OutPortByte */
-
-#ifdef OutPortWord
-#undef OutPortWord
-#endif /* OutPortWord */
-
-#ifdef OutPortLong
-#undef OutPortLong
-#endif /* OutPortLong */
-
-#ifdef InPortByte
-#undef InPortByte
-#endif /* InPortByte */
-
-#ifdef InPortWord
-#undef InPortWord
-#endif /* InPortWord */
-
-#ifdef InPortLong
-#undef InPortLong
-#endif /* InPortLong */
-
-#define OutPortByte(p,v) outb((u8)(v),(p))
-#define OutPortWord(p,v) outw((u16)(v),(p))
-#define OutPortLong(p,v) outl((u32)(v),(p))
-#define InPortByte(p) inb(p)
-#define InPortWord(p) inw(p)
-#define InPortLong(p) inl(p)
-
-#endif // _OSDEF_H_
diff --git a/drivers/staging/xgifb/vb_ext.c b/drivers/staging/xgifb/vb_ext.c
index f4969c2ced61..4358d96bad7e 100644
--- a/drivers/staging/xgifb/vb_ext.c
+++ b/drivers/staging/xgifb/vb_ext.c
@@ -1,5 +1,3 @@
-#include "osdef.h"
-
#include <linux/version.h>
#include <asm/io.h>
#include <linux/types.h>
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index dc1218463ea0..c5c7284ab679 100644
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -1,4 +1,3 @@
-#include "osdef.h"
#include "vgatypes.h"
#include <linux/version.h>
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 95efa8bb0de0..dc4e186f987e 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -1,7 +1,3 @@
-#include "osdef.h"
-
-
-
#include <asm/io.h>
#include <linux/types.h>
diff --git a/drivers/staging/xgifb/vb_util.c b/drivers/staging/xgifb/vb_util.c
index 753b1c550727..f83aee7ea90e 100644
--- a/drivers/staging/xgifb/vb_util.c
+++ b/drivers/staging/xgifb/vb_util.c
@@ -1,4 +1,3 @@
-#include "osdef.h"
#include "vb_def.h"
#include "vgatypes.h"
#include "vb_struct.h"
@@ -28,8 +27,8 @@ void XGINew_SetRegAND(ULONG Port,USHORT Index,USHORT DataAND);
/* --------------------------------------------------------------------- */
void XGINew_SetReg1( ULONG port , USHORT index , USHORT data )
{
- OutPortByte( port , index ) ;
- OutPortByte( port + 1 , data ) ;
+ outb(index, port);
+ outb(data, port + 1);
}
@@ -56,7 +55,7 @@ void XGINew_SetReg1( ULONG port , USHORT index , USHORT data )
/* --------------------------------------------------------------------- */
void XGINew_SetReg3( ULONG port , USHORT data )
{
- OutPortByte( port , data ) ;
+ outb(data, port);
}
@@ -68,7 +67,7 @@ void XGINew_SetReg3( ULONG port , USHORT data )
/* --------------------------------------------------------------------- */
void XGINew_SetReg4( ULONG port , ULONG data )
{
- OutPortLong( port , data ) ;
+ outl(data, port);
}
@@ -82,9 +81,8 @@ UCHAR XGINew_GetReg1( ULONG port , USHORT index )
{
UCHAR data ;
- OutPortByte( port , index ) ;
- data = InPortByte( port + 1 ) ;
-
+ outb(index, port);
+ data = inb(port + 1) ;
return( data ) ;
}
@@ -99,7 +97,7 @@ UCHAR XGINew_GetReg2( ULONG port )
{
UCHAR data ;
- data = InPortByte( port ) ;
+ data = inb(port) ;
return( data ) ;
}
@@ -115,7 +113,7 @@ ULONG XGINew_GetReg3( ULONG port )
{
ULONG data ;
- data = InPortLong( port ) ;
+ data = inl(port) ;
return( data ) ;
}
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h
index 745c993e057e..83fea8e37a30 100644
--- a/drivers/staging/xgifb/vgatypes.h
+++ b/drivers/staging/xgifb/vgatypes.h
@@ -2,8 +2,6 @@
#ifndef _VGATYPES_
#define _VGATYPES_
-#include "osdef.h"
-
#include <linux/ioctl.h>
#ifndef FALSE