diff options
author | Sean Young <sean@mess.org> | 2018-10-04 18:21:13 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-10-05 11:28:13 -0400 |
commit | 557c97b5133669297be561e6091da9ab6e488e65 (patch) | |
tree | ba25d1df4ecd82ada36623a4a905c14434b2c345 | |
parent | c439d5c1e13dbf66cff53455432f21d4d0536c51 (diff) |
media: cec: name for RC passthrough device does not need 'RC for'
An RC device is does not need to be called 'RC for'. Simply the name
will suffice.
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r-- | drivers/media/cec/cec-core.c | 6 | ||||
-rw-r--r-- | include/media/cec.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/cec-core.c index 74596f089ec9..e4edc930d4ed 100644 --- a/drivers/media/cec/cec-core.c +++ b/drivers/media/cec/cec-core.c | |||
@@ -307,12 +307,10 @@ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops, | |||
307 | return ERR_PTR(-ENOMEM); | 307 | return ERR_PTR(-ENOMEM); |
308 | } | 308 | } |
309 | 309 | ||
310 | snprintf(adap->device_name, sizeof(adap->device_name), | ||
311 | "RC for %s", name); | ||
312 | snprintf(adap->input_phys, sizeof(adap->input_phys), | 310 | snprintf(adap->input_phys, sizeof(adap->input_phys), |
313 | "%s/input0", name); | 311 | "%s/input0", adap->name); |
314 | 312 | ||
315 | adap->rc->device_name = adap->device_name; | 313 | adap->rc->device_name = adap->name; |
316 | adap->rc->input_phys = adap->input_phys; | 314 | adap->rc->input_phys = adap->input_phys; |
317 | adap->rc->input_id.bustype = BUS_CEC; | 315 | adap->rc->input_id.bustype = BUS_CEC; |
318 | adap->rc->input_id.vendor = 0; | 316 | adap->rc->input_id.vendor = 0; |
diff --git a/include/media/cec.h b/include/media/cec.h index 254a610b9aa5..3fe5e5d2bb7e 100644 --- a/include/media/cec.h +++ b/include/media/cec.h | |||
@@ -198,9 +198,7 @@ struct cec_adapter { | |||
198 | u16 phys_addrs[15]; | 198 | u16 phys_addrs[15]; |
199 | u32 sequence; | 199 | u32 sequence; |
200 | 200 | ||
201 | char device_name[32]; | ||
202 | char input_phys[32]; | 201 | char input_phys[32]; |
203 | char input_drv[32]; | ||
204 | }; | 202 | }; |
205 | 203 | ||
206 | static inline void *cec_get_drvdata(const struct cec_adapter *adap) | 204 | static inline void *cec_get_drvdata(const struct cec_adapter *adap) |