From 63421017394ccb4c8924342237253f5de2d9804b Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Mon, 21 Feb 2011 10:09:07 +0100 Subject: [PATCH] --- yaml --- r: 236113 b: refs/heads/master c: c73d0d55069b94630338bfeeae6d8149770e0451 h: refs/heads/master i: 236111: 5910231cbeb762057582a7811f3340d11049e8a1 v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/XGI_accel.c | 3 --- trunk/drivers/staging/xgifb/XGI_accel.h | 14 -------------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 670ef294e315..7323c9952d22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 898fcb98066cfcd6051d61638e7e3a305de34c85 +refs/heads/master: c73d0d55069b94630338bfeeae6d8149770e0451 diff --git a/trunk/drivers/staging/xgifb/XGI_accel.c b/trunk/drivers/staging/xgifb/XGI_accel.c index e6241fed04fa..7c69e0711a90 100644 --- a/trunk/drivers/staging/xgifb/XGI_accel.c +++ b/trunk/drivers/staging/xgifb/XGI_accel.c @@ -105,9 +105,6 @@ XGI310Sync(void) int XGIfb_initaccel(void) { -#ifdef XGIFB_USE_SPINLOCKS - spin_lock_init(&xgi_video_info.lockaccel); -#endif return(0); } diff --git a/trunk/drivers/staging/xgifb/XGI_accel.h b/trunk/drivers/staging/xgifb/XGI_accel.h index 5a0395bef2f2..3087e907121c 100644 --- a/trunk/drivers/staging/xgifb/XGI_accel.h +++ b/trunk/drivers/staging/xgifb/XGI_accel.h @@ -18,20 +18,6 @@ #ifndef _XGIFB_ACCEL_H #define _XGIFB_ACCEL_H -/* Guard accelerator accesses with spin_lock_irqsave? Works well without. */ -#undef XGIFB_USE_SPINLOCKS - -#ifdef XGIFB_USE_SPINLOCKS -#include -#define CRITBEGIN spin_lock_irqsave(&xgi_video_info.lockaccel), critflags); -#define CRITEND spin_unlock_irqrestore(&xgi_video_info.lockaccel), critflags); -#define CRITFLAGS unsigned long critflags; -#else -#define CRITBEGIN -#define CRITEND -#define CRITFLAGS -#endif - /* Definitions for the XGI engine communication. */ #define PATREGSIZE 384 /* Pattern register size. 384 bytes @ 0x8300 */