Staging: xgifb: Remove XGI_SetMemory and XGI_MemoryCopy

These were just macros for memset and memcpy, so use those instead.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

3 files changed, 2 insertions, 8 deletions

diff --git a/drivers/staging/xgifb/osdef.h b/drivers/staging/xgifb/osdef.h
index fb1d41149caa..7d05ea47c72f 100644
--- a/drivers/staging/xgifb/osdef.h
+++ b/drivers/staging/xgifb/osdef.h
@@ -1,10 +1,6 @@
 #ifndef _OSDEF_H_
 #define _OSDEF_H_
 
-#define XGI_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize)
-
-#define XGI_MemoryCopy(Destination,Soruce,Length) memcpy(Destination,Soruce,Length)
-
 /**********************************************************************/
 
 #ifdef OutPortByte
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 94fa48b9f9f5..dc1218463ea0 100644
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -175,8 +175,6 @@ if ( !HwDeviceExtension->bIntegratedMMEnabled )
 }
 printk("4");
 
-//    XGI_MemoryCopy( VBIOSVersion , HwDeviceExtension->szVBIOSVer , 4 ) ;
-
  //   VBIOSVersion[ 4 ] = 0x0 ;
 
     /* 09/07/99 modify by domao */
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index daf7b3c739c0..95efa8bb0de0 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -2609,7 +2609,7 @@ void XGI_ClearBuffer( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo, PVB
         {
             AdapterMemorySize = 0x40000 ;	/* clear 256k */
             /* GetDRAMSize( HwDeviceExtension ) ; */
-            XGI_SetMemory( VideoMemoryAddress , AdapterMemorySize , 0 ) ;
+	    memset(VideoMemoryAddress, 0, AdapterMemorySize);
         }
         else
         {
@@ -2631,7 +2631,7 @@ void XGI_ClearBuffer( PXGI_HW_DEVICE_INFO HwDeviceExtension , USHORT ModeNo, PVB
 */
         }
         else
-            XGI_SetMemory( VideoMemoryAddress , 0x8000 , 0 ) ;
+		memset(VideoMemoryAddress , 0, 0x8000);
     }
 }