renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 02:34:01 +08:00
Code

V4L/DVB: ir: use a real device instead of a virtual class

Browse Source 
Change the ir-sysfs approach to create irrcv0 as a device, instead of
using class_dev. Also, change the way input is registered, in order
to make its parent to be the irrcv device.

Due to this change, now the event device is created under
/sys/class/ir/irrcv class:

/sys/class/irrcv/irrcv0/
|-- current_protocol
|-- device -> ../../../1-3
|-- input9
|   |-- capabilities
|   |   |-- abs
...

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2010-03-11 12:41:56 -03:00
parent 8b0d2a0527
commit 945cdfa2c9
3 changed files with 55 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/IR/ir-keytable.c
View File

@ -449,22 +449,15 @@ int ir_input_register(struct input_dev *input_dev,
input_dev->setkeycode = ir_setkeycode;
input_set_drvdata(input_dev, ir_dev);
rc = input_register_device(input_dev);
rc = ir_register_class(input_dev);
if (rc < 0)
goto err;
rc = ir_register_class(input_dev);
if (rc < 0) {
input_unregister_device(input_dev);
goto err;
}
return 0;
err:
kfree(rc_tab->scan);
kfree(ir_dev);
input_set_drvdata(input_dev, NULL);
return rc;
}
EXPORT_SYMBOL_GPL(ir_input_register);
@ -493,7 +486,6 @@ void ir_input_unregister(struct input_dev *dev)
ir_unregister_class(dev);
kfree(ir_dev);
input_unregister_device(dev);
}
EXPORT_SYMBOL_GPL(ir_input_unregister);

76
drivers/media/IR/ir-sysfs.c
View File

@ -23,7 +23,15 @@
static unsigned long ir_core_dev_number;
/* class for /sys/class/irrcv */
static struct class *ir_input_class;
static char *ir_devnode(struct device *dev, mode_t *mode)
{
return kasprintf(GFP_KERNEL, "irrcv/%s", dev_name(dev));
}
struct class ir_input_class = {
.name = "irrcv",
.devnode = ir_devnode,
};
/**
* show_protocol() - shows the current IR protocol
@ -129,6 +137,20 @@ static struct attribute *ir_dev_attrs[] = {
NULL,
};
static struct attribute_group ir_dev_attr_grp = {
.attrs = ir_dev_attrs,
};
static const struct attribute_group *ir_dev_attr_groups[] = {
&ir_dev_attr_grp,
NULL
};
static struct device_type ir_dev_type = {
.groups = ir_dev_attr_groups,
};
/**
* ir_register_class() - creates the sysfs for /sys/class/irrcv/irrcv?
* @input_dev: the struct input_dev descriptor of the device
@ -138,7 +160,7 @@ static struct attribute *ir_dev_attrs[] = {
int ir_register_class(struct input_dev *input_dev)
{
int rc;
struct kobject *kobj;
const char *path;
struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
int devno = find_first_zero_bit(&ir_core_dev_number,
@ -147,19 +169,31 @@ int ir_register_class(struct input_dev *input_dev)
if (unlikely(devno < 0))
return devno;
ir_dev->attr.attrs = ir_dev_attrs;
ir_dev->class_dev = device_create(ir_input_class, NULL,
input_dev->dev.devt, ir_dev,
"irrcv%d", devno);
kobj = &ir_dev->class_dev->kobj;
ir_dev->dev.type = &ir_dev_type;
ir_dev->dev.class = &ir_input_class;
ir_dev->dev.parent = input_dev->dev.parent;
dev_set_name(&ir_dev->dev, "irrcv%d", devno);
rc = device_register(&ir_dev->dev);
if (rc)
return rc;
printk(KERN_WARNING "Creating IR device %s\n", kobject_name(kobj));
rc = sysfs_create_group(kobj, &ir_dev->attr);
if (unlikely(rc < 0)) {
device_destroy(ir_input_class, input_dev->dev.devt);
return -ENOMEM;
input_dev->dev.parent = &ir_dev->dev;
rc = input_register_device(input_dev);
if (rc < 0) {
device_del(&ir_dev->dev);
return rc;
}
__module_get(THIS_MODULE);
path = kobject_get_path(&input_dev->dev.kobj, GFP_KERNEL);
printk(KERN_INFO "%s: %s associated with sysfs %s\n",
dev_name(&ir_dev->dev),
input_dev->name ? input_dev->name : "Unspecified device",
path ? path : "N/A");
kfree(path);
ir_dev->devno = devno;
set_bit(devno, &ir_core_dev_number);
@ -176,16 +210,12 @@ int ir_register_class(struct input_dev *input_dev)
void ir_unregister_class(struct input_dev *input_dev)
{
struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
struct kobject *kobj;
clear_bit(ir_dev->devno, &ir_core_dev_number);
input_unregister_device(input_dev);
device_del(&ir_dev->dev);
kobj = &ir_dev->class_dev->kobj;
sysfs_remove_group(kobj, &ir_dev->attr);
device_destroy(ir_input_class, input_dev->dev.devt);
kfree(ir_dev->attr.name);
module_put(THIS_MODULE);
}
/*
@ -194,10 +224,10 @@ void ir_unregister_class(struct input_dev *input_dev)
static int __init ir_core_init(void)
{
ir_input_class = class_create(THIS_MODULE, "irrcv");
if (IS_ERR(ir_input_class)) {
int rc = class_register(&ir_input_class);
if (rc) {
printk(KERN_ERR "ir_core: unable to register irrcv class\n");
return PTR_ERR(ir_input_class);
return rc;
}
return 0;
@ -205,7 +235,7 @@ static int __init ir_core_init(void)
static void __exit ir_core_exit(void)
{
class_destroy(ir_input_class);
class_unregister(&ir_input_class);
}
module_init(ir_core_init);

4
include/media/ir-core.h
View File

@ -47,11 +47,9 @@ struct ir_dev_props {
struct ir_input_dev {
struct input_dev *dev; /* Input device*/
struct device dev; /* device */
struct ir_scancode_table rc_tab; /* scan/key table */
unsigned long devno; /* device number */
struct attribute_group attr; /* IR attributes */
struct device *class_dev; /* virtual class dev */
const struct ir_dev_props *props; /* Device properties */
};
#define to_ir_input_dev(_attr) container_of(_attr, struct ir_input_dev, attr)