summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2013-03-06 14:52:10 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-19 14:26:59 -0400
commit40fc5325e1b6764754116cc36dd34adfb964ef65 (patch)
treecb14b601e506a1f4d44097194fc3fc7e781ba3b5 /drivers/media
parente76d4ce49f574b6d94324239f8b7d655774d062c (diff)
[media] rc-core: rename ir_input_class to rc_class
The name is already misleading and will be more so in the future as the connection to the input subsystem is obscured away further. Signed-off-by: David Härdeman <david@hardeman.nu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/rc/rc-main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index a92b8c536c89..f3047920b8c0 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -715,14 +715,14 @@ static void ir_close(struct input_dev *idev)
715} 715}
716 716
717/* class for /sys/class/rc */ 717/* class for /sys/class/rc */
718static char *ir_devnode(struct device *dev, umode_t *mode) 718static char *rc_devnode(struct device *dev, umode_t *mode)
719{ 719{
720 return kasprintf(GFP_KERNEL, "rc/%s", dev_name(dev)); 720 return kasprintf(GFP_KERNEL, "rc/%s", dev_name(dev));
721} 721}
722 722
723static struct class ir_input_class = { 723static struct class rc_class = {
724 .name = "rc", 724 .name = "rc",
725 .devnode = ir_devnode, 725 .devnode = rc_devnode,
726}; 726};
727 727
728/* 728/*
@@ -1016,7 +1016,7 @@ struct rc_dev *rc_allocate_device(void)
1016 setup_timer(&dev->timer_keyup, ir_timer_keyup, (unsigned long)dev); 1016 setup_timer(&dev->timer_keyup, ir_timer_keyup, (unsigned long)dev);
1017 1017
1018 dev->dev.type = &rc_dev_type; 1018 dev->dev.type = &rc_dev_type;
1019 dev->dev.class = &ir_input_class; 1019 dev->dev.class = &rc_class;
1020 device_initialize(&dev->dev); 1020 device_initialize(&dev->dev);
1021 1021
1022 __module_get(THIS_MODULE); 1022 __module_get(THIS_MODULE);
@@ -1190,7 +1190,7 @@ EXPORT_SYMBOL_GPL(rc_unregister_device);
1190 1190
1191static int __init rc_core_init(void) 1191static int __init rc_core_init(void)
1192{ 1192{
1193 int rc = class_register(&ir_input_class); 1193 int rc = class_register(&rc_class);
1194 if (rc) { 1194 if (rc) {
1195 printk(KERN_ERR "rc_core: unable to register rc class\n"); 1195 printk(KERN_ERR "rc_core: unable to register rc class\n");
1196 return rc; 1196 return rc;
@@ -1203,7 +1203,7 @@ static int __init rc_core_init(void)
1203 1203
1204static void __exit rc_core_exit(void) 1204static void __exit rc_core_exit(void)
1205{ 1205{
1206 class_unregister(&ir_input_class); 1206 class_unregister(&rc_class);
1207 rc_map_unregister(&empty_map); 1207 rc_map_unregister(&empty_map);
1208} 1208}
1209 1209