Skip to content

Commit

Permalink
Staging: xgifb: Remove unused spinlock conditional compilation logic
Browse files Browse the repository at this point in the history
xgifb staging driver for XG20, XG21, XG40, XG42 frame buffer device
has a accelerator engine that never get used (XGIfb_accel is always 0).

Also the driver has a set of defines that hides the synchronization
mechanism used to access critical sections and a way to disable spinlocks
use at compile time.

In a earlier patch all the code that depends on the accelerator being active
was deleted because it was dead code. Since the only usage of this
synchronization defines were in that dead code, this patch removes all the
now unused spinlock conditional compilation logic.

Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Acked-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Javier Martinez Canillas authored and Greg Kroah-Hartman committed Feb 23, 2011
1 parent 898fcb9 commit c73d0d5
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
3 changes: 0 additions & 3 deletions drivers/staging/xgifb/XGI_accel.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,6 @@ XGI310Sync(void)

int XGIfb_initaccel(void)
{
#ifdef XGIFB_USE_SPINLOCKS
spin_lock_init(&xgi_video_info.lockaccel);
#endif
return(0);
}

Expand Down
14 changes: 0 additions & 14 deletions drivers/staging/xgifb/XGI_accel.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <linux/spinlock.h>
#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 */
Expand Down

0 comments on commit c73d0d5

Please sign in to comment.