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>

diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/cec-core.c
index 74596f089ec941bfdb871a45a04b342547a06319..e4edc930d4ed35c63b8515991f8c463d806fe6dd 100644 (file)
--- 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,
                return ERR_PTR(-ENOMEM);
        }
 
-       snprintf(adap->device_name, sizeof(adap->device_name),
-                "RC for %s", name);
        snprintf(adap->input_phys, sizeof(adap->input_phys),
-                "%s/input0", name);
+                "%s/input0", adap->name);
 
-       adap->rc->device_name = adap->device_name;
+       adap->rc->device_name = adap->name;
        adap->rc->input_phys = adap->input_phys;
        adap->rc->input_id.bustype = BUS_CEC;
        adap->rc->input_id.vendor = 0;

diff --git a/include/media/cec.h b/include/media/cec.h
index 254a610b9aa584466eaac093e35df8b9fc0f00d1..3fe5e5d2bb7e50b67b98dbbceae5ab2521591b90 100644 (file)
--- a/include/media/cec.h
+++ b/include/media/cec.h
@@ -198,9 +198,7 @@ struct cec_adapter {
        u16 phys_addrs[15];
        u32 sequence;
 
-       char device_name[32];
        char input_phys[32];
-       char input_drv[32];
 };
 
 static inline void *cec_get_drvdata(const struct cec_adapter *adap)