iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CAPI: Clean up capiminors_lock

Browse Source 
Use a plain spin lock for capiminors_lock, drop inconsistent irqsafe
acquisitions (it's only used in process context anyway).

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jan Kiszka 2010-02-08 10:12:33 +00:00 committed by David S. Miller
parent 6576c2891a
commit 3d5d30fe7a
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/isdn/capi/capi.c
View File

@ -149,7 +149,7 @@ static LIST_HEAD(capidev_list);
#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
static DEFINE_RWLOCK(capiminors_lock); static DEFINE_SPINLOCK(capiminors_lock);
static struct capiminor **capiminors; static struct capiminor **capiminors;
static struct tty_driver *capinc_tty_driver; static struct tty_driver *capinc_tty_driver;
@ -218,7 +218,6 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)
struct capiminor *mp; struct capiminor *mp;
struct device *dev; struct device *dev;
unsigned int minor; unsigned int minor;
unsigned long flags;
mp = kzalloc(sizeof(*mp), GFP_KERNEL); mp = kzalloc(sizeof(*mp), GFP_KERNEL);
if (!mp) { if (!mp) {
@ -242,13 +241,13 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)
mp->port.ops = &capiminor_port_ops; mp->port.ops = &capiminor_port_ops;
/* Allocate the least unused minor number. */ /* Allocate the least unused minor number. */
write_lock_irqsave(&capiminors_lock, flags); spin_lock(&capiminors_lock);
for (minor = 0; minor < capi_ttyminors; minor++) for (minor = 0; minor < capi_ttyminors; minor++)
if (!capiminors[minor]) { if (!capiminors[minor]) {
capiminors[minor] = mp; capiminors[minor] = mp;
break; break;
} }
write_unlock_irqrestore(&capiminors_lock, flags); spin_unlock(&capiminors_lock);
if (minor == capi_ttyminors) { if (minor == capi_ttyminors) {
printk(KERN_NOTICE "capi: out of minors\n"); printk(KERN_NOTICE "capi: out of minors\n");
@ -264,9 +263,9 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)
return mp; return mp;
err_out2: err_out2:
write_lock_irqsave(&capiminors_lock, flags); spin_lock(&capiminors_lock);
capiminors[minor] = NULL; capiminors[minor] = NULL;
write_unlock_irqrestore(&capiminors_lock, flags); spin_unlock(&capiminors_lock);
err_out1: err_out1:
kfree(mp); kfree(mp);
@ -288,11 +287,11 @@ static struct capiminor *capiminor_get(unsigned int minor)
{ {
struct capiminor *mp; struct capiminor *mp;
read_lock(&capiminors_lock); spin_lock(&capiminors_lock);
mp = capiminors[minor]; mp = capiminors[minor];
if (mp) if (mp)
kref_get(&mp->kref); kref_get(&mp->kref);
read_unlock(&capiminors_lock); spin_unlock(&capiminors_lock);
return mp; return mp;
} }
@ -304,13 +303,11 @@ static inline void capiminor_put(struct capiminor *mp)
static void capiminor_free(struct capiminor *mp) static void capiminor_free(struct capiminor *mp)
{ {
unsigned long flags;
tty_unregister_device(capinc_tty_driver, mp->minor); tty_unregister_device(capinc_tty_driver, mp->minor);
write_lock_irqsave(&capiminors_lock, flags); spin_lock(&capiminors_lock);
capiminors[mp->minor] = NULL; capiminors[mp->minor] = NULL;
write_unlock_irqrestore(&capiminors_lock, flags); spin_unlock(&capiminors_lock);
capiminor_put(mp); capiminor_put(mp);
} }