Commit 36ef4080 authored by Mark Asselstine's avatar Mark Asselstine Committed by David S. Miller

atm nicstar: Removal of debug code containing deprecated calls to cli()/sti()

Code within NS_DEBUG_SPINLOCKS contained deprecated cli()/sti()
function calls.  NS_DEBUG_SPINLOCKS and the associated code seems to
be of little use these days so the strategy of removing this code
rather then updating it to use spinlocks has been taken.
Signed-off-by: default avatarMark Asselstine <mark.asselstine@windriver.com>
Reviewed-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 344234de
This diff is collapsed.
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
/* Options ********************************************************************/ /* Options ********************************************************************/
#undef NS_DEBUG_SPINLOCKS
#define NS_MAX_CARDS 4 /* Maximum number of NICStAR based cards #define NS_MAX_CARDS 4 /* Maximum number of NICStAR based cards
controlled by the device driver. Must controlled by the device driver. Must
be <= 5 */ be <= 5 */
...@@ -721,10 +719,6 @@ typedef struct scq_info ...@@ -721,10 +719,6 @@ typedef struct scq_info
wait_queue_head_t scqfull_waitq; wait_queue_head_t scqfull_waitq;
volatile char full; /* SCQ full indicator */ volatile char full; /* SCQ full indicator */
spinlock_t lock; /* SCQ spinlock */ spinlock_t lock; /* SCQ spinlock */
#ifdef NS_DEBUG_SPINLOCKS
volatile long has_lock;
volatile int cpu_lock;
#endif /* NS_DEBUG_SPINLOCKS */
} scq_info; } scq_info;
...@@ -810,12 +804,6 @@ typedef struct ns_dev ...@@ -810,12 +804,6 @@ typedef struct ns_dev
unsigned intcnt; /* Interrupt counter */ unsigned intcnt; /* Interrupt counter */
spinlock_t int_lock; /* Interrupt lock */ spinlock_t int_lock; /* Interrupt lock */
spinlock_t res_lock; /* Card resource lock */ spinlock_t res_lock; /* Card resource lock */
#ifdef NS_DEBUG_SPINLOCKS
volatile long has_int_lock;
volatile int cpu_int;
volatile long has_res_lock;
volatile int cpu_res;
#endif /* NS_DEBUG_SPINLOCKS */
} ns_dev; } ns_dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment