diff options
author | William Hubbs <w.d.hubbs@gmail.com> | 2013-05-13 13:31:40 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-16 16:14:50 -0700 |
commit | 667b614118b3bae7d2a82732cdde71730a3d080c (patch) | |
tree | d590315eef7f5efabc7f051dd44057de22fa15c3 /drivers/staging/speakup | |
parent | 6697330ac556541fff5e1430ca68fadd60c4247a (diff) | |
download | linux-667b614118b3bae7d2a82732cdde71730a3d080c.tar.gz linux-667b614118b3bae7d2a82732cdde71730a3d080c.tar.bz2 linux-667b614118b3bae7d2a82732cdde71730a3d080c.zip |
staging: speakup: remove custom locking macro definitions
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/speakup')
-rw-r--r-- | drivers/staging/speakup/spk_priv.h | 12 | ||||
-rw-r--r-- | drivers/staging/speakup/synth.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/speakup/spk_priv.h b/drivers/staging/speakup/spk_priv.h index 141125c3a54e..637ba6760ec0 100644 --- a/drivers/staging/speakup/spk_priv.h +++ b/drivers/staging/speakup/spk_priv.h @@ -77,16 +77,4 @@ extern struct speakup_info_t speakup_info; extern struct var_t synth_time_vars[]; -/* Protect the whole speakup machinery, must be taken at each kernel->speakup - * transition and released at all corresponding speakup->kernel transitions - * (flags must be the same variable between lock/trylock and unlock). - * - * The progression thread only interferes with the speakup machinery through - * the synth buffer, and so only needs to take the lock while tinkering with - * it. - */ -/* Speakup needs to disable the keyboard IRQ, hence _irqsave/restore */ -#define spk_lock(flags) spin_lock_irqsave(&speakup_info.spinlock, flags) -#define spk_unlock(flags) spin_unlock_irqrestore(&speakup_info.spinlock, flags) - #endif diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c index 1036f47b9464..e2d84c090d64 100644 --- a/drivers/staging/speakup/synth.c +++ b/drivers/staging/speakup/synth.c @@ -25,6 +25,18 @@ static int module_status; bool spk_quiet_boot; struct speakup_info_t speakup_info = { + /* + * This spinlock is used to protect the entire speakup machinery, and + * must be taken at each kernel->speakup transition and released at + * each corresponding speakup->kernel transition. + * + * The progression thread only interferes with the speakup machinery through + * the synth buffer, so only needs to take the lock while tinkering with + * the buffer. + * + * We use spin_lock/trylock_irqsave and spin_unlock_irqrestore with this + * spinlock because speakup needs to disable the keyboard IRQ. + */ .spinlock = __SPIN_LOCK_UNLOCKED(speakup_info.spinlock), .flushing = 0, }; |