shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: [media] media: lirc_dev: use an IDA instead of an array to keep track of registered devices

Browse Source 
Using the kernel-provided IDA simplifies the code and makes it possible
to remove the lirc_dev_lock mutex.

Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
(cherry picked from commit 46c8f47711)
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
This commit is contained in:
David Härdeman
2017-06-25 09:32:05 -03:00
committed by Tao Huang
parent d7978b7f41
commit 3cecaddef9
2 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/media/rc/lirc_dev.c
View File

@@ -30,6 +30,7 @@
#include <linux/mutex.h>
#include <linux/device.h>
#include <linux/cdev.h>
#include <linux/idr.h>
#include <media/rc-core.h>
#include <media/lirc.h>
@@ -52,10 +53,9 @@ struct irctl {
struct cdev cdev;
};
/* This mutex protects the irctls array */
static DEFINE_MUTEX(lirc_dev_lock);
static struct irctl *irctls[MAX_IRCTL_DEVICES];
/* Used to keep track of allocated lirc devices */
#define LIRC_MAX_DEVICES 256
static DEFINE_IDA(lirc_ida);
/* Only used for sysfs but defined to void otherwise */
static struct class *lirc_class;
@@ -75,9 +75,6 @@ static void lirc_release(struct device *ld)
{
struct irctl *ir = container_of(ld, struct irctl, dev);
mutex_lock(&lirc_dev_lock);
irctls[ir->d.minor] = NULL;
mutex_unlock(&lirc_dev_lock);
lirc_free_buffer(ir);
kfree(ir);
}
@@ -115,7 +112,7 @@ out:
int lirc_register_driver(struct lirc_driver *d)
{
struct irctl *ir;
unsigned int minor;
int minor;
int err;
if (!d) {
@@ -177,28 +174,17 @@ int lirc_register_driver(struct lirc_driver *d)
d->rbuf = ir->buf;
}
mutex_lock(&lirc_dev_lock);
/* find first free slot for driver */
for (minor = 0; minor < MAX_IRCTL_DEVICES; minor++)
if (!irctls[minor])
break;
if (minor == MAX_IRCTL_DEVICES) {
dev_err(d->dev, "no free slots for drivers!\n");
mutex_unlock(&lirc_dev_lock);
minor = ida_simple_get(&lirc_ida, 0, LIRC_MAX_DEVICES, GFP_KERNEL);
if (minor < 0) {
lirc_free_buffer(ir);
kfree(ir);
return -ENOMEM;
return minor;
}
irctls[minor] = ir;
d->irctl = ir;
d->minor = minor;
ir->d.minor = minor;
mutex_unlock(&lirc_dev_lock);
device_initialize(&ir->dev);
ir->dev.devt = MKDEV(MAJOR(lirc_base_dev), ir->d.minor);
ir->dev.class = lirc_class;
@@ -212,6 +198,7 @@ int lirc_register_driver(struct lirc_driver *d)
err = cdev_device_add(&ir->cdev, &ir->dev);
if (err) {
ida_simple_remove(&lirc_ida, minor);
put_device(&ir->dev);
return err;
}
@@ -250,6 +237,7 @@ void lirc_unregister_driver(struct lirc_driver *d)
mutex_unlock(&ir->mutex);
ida_simple_remove(&lirc_ida, d->minor);
put_device(&ir->dev);
}
EXPORT_SYMBOL(lirc_unregister_driver);
@@ -546,7 +534,7 @@ static int __init lirc_dev_init(void)
return PTR_ERR(lirc_class);
}
retval = alloc_chrdev_region(&lirc_base_dev, 0, MAX_IRCTL_DEVICES,
retval = alloc_chrdev_region(&lirc_base_dev, 0, LIRC_MAX_DEVICES,
"BaseRemoteCtl");
if (retval) {
class_destroy(lirc_class);
@@ -563,7 +551,7 @@ static int __init lirc_dev_init(void)
static void __exit lirc_dev_exit(void)
{
class_destroy(lirc_class);
unregister_chrdev_region(lirc_base_dev, MAX_IRCTL_DEVICES);
unregister_chrdev_region(lirc_base_dev, LIRC_MAX_DEVICES);
pr_info("module unloaded\n");
}

1
include/media/lirc_dev.h
View File

@@ -9,7 +9,6 @@
#ifndef _LINUX_LIRC_DEV_H
#define _LINUX_LIRC_DEV_H
#define MAX_IRCTL_DEVICES 8
#define BUFLEN 16
#define mod(n, div) ((n) % (div))