lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Input: serio_raw - use kref instead of rolling out its own refcounting

Browse Source 
Reviewed-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov
2011-10-10 18:30:03 -07:00
parent b5d2170436
commit ba538cd2a8
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/input/serio/serio_raw.c
View File

@@ -9,6 +9,7 @@
* the Free Software Foundation. * the Free Software Foundation.
*/ */
#include <linux/kref.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/poll.h> #include <linux/poll.h>
@@ -33,7 +34,7 @@ struct serio_raw {
unsigned int tail, head; unsigned int tail, head;
char name[16]; char name[16];
unsigned int refcnt; struct kref kref;
struct serio *serio; struct serio *serio;
struct miscdevice dev; struct miscdevice dev;
wait_queue_head_t wait; wait_queue_head_t wait;
@@ -104,7 +105,7 @@ static int serio_raw_open(struct inode *inode, struct file *file)
list->serio_raw = serio_raw; list->serio_raw = serio_raw;
file->private_data = list; file->private_data = list;
serio_raw->refcnt++; kref_get(&serio_raw->kref);
list_add_tail(&list->node, &serio_raw->list); list_add_tail(&list->node, &serio_raw->list);
out: out:
@@ -112,17 +113,14 @@ out:
return retval; return retval;
} }
static int serio_raw_cleanup(struct serio_raw *serio_raw) static void serio_raw_cleanup(struct kref *kref)
{ {
if (--serio_raw->refcnt == 0) { struct serio_raw *serio_raw =
misc_deregister(&serio_raw->dev); container_of(kref, struct serio_raw, kref);
list_del_init(&serio_raw->node);
kfree(serio_raw);
return 1; misc_deregister(&serio_raw->dev);
} list_del_init(&serio_raw->node);
kfree(serio_raw);
return 0;
} }
static int serio_raw_release(struct inode *inode, struct file *file) static int serio_raw_release(struct inode *inode, struct file *file)
@@ -132,7 +130,7 @@ static int serio_raw_release(struct inode *inode, struct file *file)
mutex_lock(&serio_raw_mutex); mutex_lock(&serio_raw_mutex);
serio_raw_cleanup(serio_raw); kref_put(&serio_raw->kref, serio_raw_cleanup);
mutex_unlock(&serio_raw_mutex); mutex_unlock(&serio_raw_mutex);
return 0; return 0;
@@ -283,7 +281,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
mutex_lock(&serio_raw_mutex); mutex_lock(&serio_raw_mutex);
snprintf(serio_raw->name, sizeof(serio_raw->name), "serio_raw%d", serio_raw_no++); snprintf(serio_raw->name, sizeof(serio_raw->name), "serio_raw%d", serio_raw_no++);
serio_raw->refcnt = 1; kref_init(&serio_raw->kref);
serio_raw->serio = serio; serio_raw->serio = serio;
INIT_LIST_HEAD(&serio_raw->list); INIT_LIST_HEAD(&serio_raw->list);
init_waitqueue_head(&serio_raw->wait); init_waitqueue_head(&serio_raw->wait);
@@ -357,8 +355,8 @@ static void serio_raw_disconnect(struct serio *serio)
serio_set_drvdata(serio, NULL); serio_set_drvdata(serio, NULL);
serio_raw->serio = NULL; serio_raw->serio = NULL;
if (!serio_raw_cleanup(serio_raw)) wake_up_interruptible(&serio_raw->wait);
wake_up_interruptible(&serio_raw->wait); kref_put(&serio_raw->kref, serio_raw_cleanup);
mutex_unlock(&serio_raw_mutex); mutex_unlock(&serio_raw_mutex);
} }