diff options
| author | Mark Asselstine <mark.asselstine@windriver.com> | 2008-04-19 18:10:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-19 18:10:46 -0700 |
| commit | 36ef408061da9e012375547d69b27cc1f537b044 (patch) | |
| tree | 9bf351fd880d79c1dd53590ba7494de003a94dff /drivers/atm/nicstar.h | |
| parent | 344234de54891ed15bf8127e4640ff9238076d6c (diff) | |
| download | linux-3.10-36ef408061da9e012375547d69b27cc1f537b044.tar.gz linux-3.10-36ef408061da9e012375547d69b27cc1f537b044.tar.bz2 linux-3.10-36ef408061da9e012375547d69b27cc1f537b044.zip | |
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: Mark Asselstine <mark.asselstine@windriver.com>
Reviewed-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm/nicstar.h')
| -rw-r--r-- | drivers/atm/nicstar.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/atm/nicstar.h b/drivers/atm/nicstar.h index 5997bcb45b5..6010e3daa6a 100644 --- a/drivers/atm/nicstar.h +++ b/drivers/atm/nicstar.h @@ -28,8 +28,6 @@ /* Options ********************************************************************/ -#undef NS_DEBUG_SPINLOCKS - #define NS_MAX_CARDS 4 /* Maximum number of NICStAR based cards controlled by the device driver. Must be <= 5 */ @@ -721,10 +719,6 @@ typedef struct scq_info wait_queue_head_t scqfull_waitq; volatile char full; /* SCQ full indicator */ spinlock_t lock; /* SCQ spinlock */ -#ifdef NS_DEBUG_SPINLOCKS - volatile long has_lock; - volatile int cpu_lock; -#endif /* NS_DEBUG_SPINLOCKS */ } scq_info; @@ -810,12 +804,6 @@ typedef struct ns_dev unsigned intcnt; /* Interrupt counter */ spinlock_t int_lock; /* Interrupt 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; |