summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorSean Young <sean@mess.org>2017-07-01 12:13:19 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-08-20 09:43:52 -0400
commit518f4b26be1ebf6ce220c4e37b5c7e5410c4d064 (patch)
treed5f52b67b2c8635687f223a1a3454b737d5637e0 /include/media
parentdb68102c8d5eeea173ae4187b4e581fa146bc094 (diff)
downloadlinux-518f4b26be1ebf6ce220c4e37b5c7e5410c4d064.tar.bz2
media: rc-core: rename input_name to device_name
When an ir-spi is registered, you get this message. rc rc0: Unspecified device as /devices/platform/soc/3f215080.spi/spi_master/spi32766/spi32766.128/rc/rc0 "Unspecified device" refers to input_name, which makes no sense for IR TX only devices. So, rename to device_name. Also make driver_name const char* so that no casts are needed anywhere. Now ir-spi reports: rc rc0: IR SPI as /devices/platform/soc/3f215080.spi/spi_master/spi32766/spi32766.128/rc/rc0 Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/cec.h2
-rw-r--r--include/media/rc-core.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/media/cec.h b/include/media/cec.h
index 224359c9941a..d97aa6c32abd 100644
--- a/include/media/cec.h
+++ b/include/media/cec.h
@@ -203,7 +203,7 @@ struct cec_adapter {
u16 phys_addrs[15];
u32 sequence;
- char input_name[32];
+ char device_name[32];
char input_phys[32];
char input_drv[32];
};
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index 78dea39a9b39..16bd89caa22d 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -72,7 +72,7 @@ enum rc_filter_type {
* @dev: driver model's view of this device
* @managed_alloc: devm_rc_allocate_device was used to create rc_dev
* @sysfs_groups: sysfs attribute groups
- * @input_name: name of the input child device
+ * @device_name: name of the rc child device
* @input_phys: physical path to the input child device
* @input_id: id of the input child device (struct input_id)
* @driver_name: name of the hardware driver which registered this device
@@ -138,10 +138,10 @@ struct rc_dev {
struct device dev;
bool managed_alloc;
const struct attribute_group *sysfs_groups[5];
- const char *input_name;
+ const char *device_name;
const char *input_phys;
struct input_id input_id;
- char *driver_name;
+ const char *driver_name;
const char *map_name;
struct rc_map rc_map;
struct mutex lock;