Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c73d0d55 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Greg Kroah-Hartman
Browse files

Staging: xgifb: Remove unused spinlock conditional compilation logic 



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: default avatarJavier Martinez Canillas <martinez.javier@gmail.com>
Acked-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 898fcb98

drivers/staging/xgifb/XGI_accel.c

+0 −3
Original line number Diff line number Diff line
@@ -105,9 +105,6 @@ XGI310Sync(void) 


int XGIfb_initaccel(void)

{

#ifdef XGIFB_USE_SPINLOCKS

    spin_lock_init(&xgi_video_info.lockaccel);

#endif

    return(0);

}

drivers/staging/xgifb/XGI_accel.h

+0 −14
Original line number Diff line number Diff line
@@ -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 */