diff options
Diffstat (limited to 'drivers/dahdi/xpp')
| -rw-r--r-- | drivers/dahdi/xpp/mmapdrv.c | 2 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/parport_debug.c | 2 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/xbus-core.c | 4 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/xbus-pcm.c | 4 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/xpp_usb.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/dahdi/xpp/mmapdrv.c b/drivers/dahdi/xpp/mmapdrv.c index 6f38587..1ca3140 100644 --- a/drivers/dahdi/xpp/mmapdrv.c +++ b/drivers/dahdi/xpp/mmapdrv.c @@ -68,7 +68,7 @@ struct counter { static xbus_t *global_xbus; static bool tx_ready = 1; -static spinlock_t tx_ready_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(tx_ready_lock); static struct xframe_queue txpool; static unsigned int pcm_in_pool_count; static bool disconnecting; diff --git a/drivers/dahdi/xpp/parport_debug.c b/drivers/dahdi/xpp/parport_debug.c index 93049ef..23c0b41 100644 --- a/drivers/dahdi/xpp/parport_debug.c +++ b/drivers/dahdi/xpp/parport_debug.c @@ -36,7 +36,7 @@ static int parport_toggles[8]; /* 8 bit flip-flop */ void flip_parport_bit(unsigned char bitnum) { static unsigned char last_value; - spinlock_t lock = SPIN_LOCK_UNLOCKED; + DEFINE_SPINLOCK(lock); unsigned long flags; unsigned char mask; unsigned char value; diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c index 144d565..9223891 100644 --- a/drivers/dahdi/xpp/xbus-core.c +++ b/drivers/dahdi/xpp/xbus-core.c @@ -78,7 +78,7 @@ static void transport_init(xbus_t *xbus, struct xbus_ops *ops, ushort max_send_s static void transport_destroy(xbus_t *xbus); /* Data structures */ -static spinlock_t xbuses_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(xbuses_lock); #ifdef CONFIG_PROC_FS static struct proc_dir_entry *proc_xbuses = NULL; #endif @@ -405,7 +405,7 @@ xpacket_t *xframe_next_packet(xframe_t *frm, int len) return (xpacket_t *)(frm->packets + newlen - len); } -static spinlock_t serialize_dump_xframe = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(serialize_dump_xframe); static void do_hexdump(const char msg[], byte *data, uint16_t len) { diff --git a/drivers/dahdi/xpp/xbus-pcm.c b/drivers/dahdi/xpp/xbus-pcm.c index 39b772b..cad61fb 100644 --- a/drivers/dahdi/xpp/xbus-pcm.c +++ b/drivers/dahdi/xpp/xbus-pcm.c @@ -55,8 +55,8 @@ static struct xpp_ticker dahdi_ticker; * I.e: one of our AB or dahdi_ticker */ static struct xpp_ticker *ref_ticker = NULL; -static spinlock_t ref_ticker_lock = SPIN_LOCK_UNLOCKED; -static spinlock_t elect_syncer_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(ref_ticker_lock); +static DEFINE_SPINLOCK(elect_syncer_lock); static bool force_dahdi_sync = 0; /* from /sys/bus/astribanks/drivers/xppdrv/sync */ static xbus_t *global_ticker; static struct xpp_ticker global_ticks_series; diff --git a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c index 40e5f9e..edc499b 100644 --- a/drivers/dahdi/xpp/xpp_usb.c +++ b/drivers/dahdi/xpp/xpp_usb.c @@ -242,7 +242,7 @@ struct xusb { }; -static spinlock_t xusb_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(xusb_lock); static xusb_t *xusb_array[MAX_BUSES] = {}; static unsigned bus_count = 0; |