diff options
author | David Härdeman <david@hardeman.nu> | 2010-03-28 17:38:49 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 11:57:01 -0400 |
commit | de88f31cef8fee7c890cf2128bec8dae06bb20f2 (patch) | |
tree | aebcd08d35830c6f542aff7118cd64295c31054e /drivers/media/IR | |
parent | 6eb9435b874ae5ff56d56952167a8e9be5c5deeb (diff) |
V4L/DVB: rename sysfs remote controller devices from rcrcv to rc
When the remote controller class is anyway being renamed from ir to rc
this would be a good time to also rename the devices from rcrcvX to rcX.
I know we haven't reached any agreement on whether transmission will
eventually be handled by the same device, but this change will at
least make the device name non-receive-specific which will make it
possible in the future (and if a different approach is finally
agreed upon, the device name still works).
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/IR')
-rw-r--r-- | drivers/media/IR/ir-sysfs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c index 58ecca2003a4..c33333f1f60e 100644 --- a/drivers/media/IR/ir-sysfs.c +++ b/drivers/media/IR/ir-sysfs.c | |||
@@ -40,7 +40,7 @@ static struct class ir_input_class = { | |||
40 | * @buf: a pointer to the output buffer | 40 | * @buf: a pointer to the output buffer |
41 | * | 41 | * |
42 | * This routine is a callback routine for input read the IR protocol type. | 42 | * This routine is a callback routine for input read the IR protocol type. |
43 | * it is trigged by reading /sys/class/rc/rcrcv?/current_protocol. | 43 | * it is trigged by reading /sys/class/rc/rc?/current_protocol. |
44 | * It returns the protocol name, as understood by the driver. | 44 | * It returns the protocol name, as understood by the driver. |
45 | */ | 45 | */ |
46 | static ssize_t show_protocol(struct device *d, | 46 | static ssize_t show_protocol(struct device *d, |
@@ -75,7 +75,7 @@ static ssize_t show_protocol(struct device *d, | |||
75 | * @len: length of the input buffer | 75 | * @len: length of the input buffer |
76 | * | 76 | * |
77 | * This routine is a callback routine for changing the IR protocol type. | 77 | * This routine is a callback routine for changing the IR protocol type. |
78 | * it is trigged by reading /sys/class/rc/rcrcv?/current_protocol. | 78 | * it is trigged by reading /sys/class/rc/rc?/current_protocol. |
79 | * It changes the IR the protocol name, if the IR type is recognized | 79 | * It changes the IR the protocol name, if the IR type is recognized |
80 | * by the driver. | 80 | * by the driver. |
81 | * If an unknown protocol name is used, returns -EINVAL. | 81 | * If an unknown protocol name is used, returns -EINVAL. |
@@ -172,7 +172,7 @@ static struct device_type ir_dev_type = { | |||
172 | }; | 172 | }; |
173 | 173 | ||
174 | /** | 174 | /** |
175 | * ir_register_class() - creates the sysfs for /sys/class/rc/rcrcv? | 175 | * ir_register_class() - creates the sysfs for /sys/class/rc/rc? |
176 | * @input_dev: the struct input_dev descriptor of the device | 176 | * @input_dev: the struct input_dev descriptor of the device |
177 | * | 177 | * |
178 | * This routine is used to register the syfs code for IR class | 178 | * This routine is used to register the syfs code for IR class |
@@ -192,7 +192,7 @@ int ir_register_class(struct input_dev *input_dev) | |||
192 | ir_dev->dev.type = &ir_dev_type; | 192 | ir_dev->dev.type = &ir_dev_type; |
193 | ir_dev->dev.class = &ir_input_class; | 193 | ir_dev->dev.class = &ir_input_class; |
194 | ir_dev->dev.parent = input_dev->dev.parent; | 194 | ir_dev->dev.parent = input_dev->dev.parent; |
195 | dev_set_name(&ir_dev->dev, "rcrcv%d", devno); | 195 | dev_set_name(&ir_dev->dev, "rc%d", devno); |
196 | dev_set_drvdata(&ir_dev->dev, ir_dev); | 196 | dev_set_drvdata(&ir_dev->dev, ir_dev); |
197 | rc = device_register(&ir_dev->dev); | 197 | rc = device_register(&ir_dev->dev); |
198 | if (rc) | 198 | if (rc) |
@@ -223,7 +223,7 @@ int ir_register_class(struct input_dev *input_dev) | |||
223 | 223 | ||
224 | /** | 224 | /** |
225 | * ir_unregister_class() - removes the sysfs for sysfs for | 225 | * ir_unregister_class() - removes the sysfs for sysfs for |
226 | * /sys/class/rc/rcrcv? | 226 | * /sys/class/rc/rc? |
227 | * @input_dev: the struct input_dev descriptor of the device | 227 | * @input_dev: the struct input_dev descriptor of the device |
228 | * | 228 | * |
229 | * This routine is used to unregister the syfs code for IR class | 229 | * This routine is used to unregister the syfs code for IR class |