From cc75bb02db530748515f0bf95039c4a15b3ef0be Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Thu, 17 Jun 2010 13:10:40 -0400 Subject: [PATCH 145/524] 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 Cc: Arnaud Patard Signed-off-by: Greg Kroah-Hartman --- drivers/staging/xgifb/osdef.h | 4 ---- drivers/staging/xgifb/vb_init.c | 2 -- drivers/staging/xgifb/vb_setmode.c | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/xgifb/osdef.h b/drivers/staging/xgifb/osdef.h index fb1d411..7d05ea4 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 94fa48b..dc12184 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 daf7b3c..95efa8b 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); } } -- 1.7.1