From 75f73ebfbb932bb0ba3bb477d93fc2f653fa6f4f Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Thu, 17 Jun 2010 13:10:40 -0400
Subject: [PATCH] --- yaml --- r: 205688 b: refs/heads/master c:
 cc75bb02db530748515f0bf95039c4a15b3ef0be h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/staging/xgifb/osdef.h      | 4 ----
 trunk/drivers/staging/xgifb/vb_init.c    | 2 --
 trunk/drivers/staging/xgifb/vb_setmode.c | 4 ++--
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 1afcd8b36dc9..fb551d784ad9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2f58e14efe5d1de1003a05fbdb82a66fc22dfb8
+refs/heads/master: cc75bb02db530748515f0bf95039c4a15b3ef0be
diff --git a/trunk/drivers/staging/xgifb/osdef.h b/trunk/drivers/staging/xgifb/osdef.h
index fb1d41149caa..7d05ea47c72f 100644
--- a/trunk/drivers/staging/xgifb/osdef.h
+++ b/trunk/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/trunk/drivers/staging/xgifb/vb_init.c b/trunk/drivers/staging/xgifb/vb_init.c
index 94fa48b9f9f5..dc1218463ea0 100644
--- a/trunk/drivers/staging/xgifb/vb_init.c
+++ b/trunk/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/trunk/drivers/staging/xgifb/vb_setmode.c b/trunk/drivers/staging/xgifb/vb_setmode.c
index daf7b3c739c0..95efa8bb0de0 100644
--- a/trunk/drivers/staging/xgifb/vb_setmode.c
+++ b/trunk/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);
     }
 }