media: adv*/vivid/pulse8/rainshadow: cec: use CEC_CAP_DEFAULTS

Use the new CEC_CAP_DEFAULTS define in the adv, vivid, pulse8 and
rainshadow CEC drivers.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c
index ccc478605643bb7adc4099e4b5a2b8bea46ee8c3..aef02c994df9df4b0b7d181981972326c08de589 100644 (file)
--- a/drivers/media/i2c/adv7511.c
+++ b/drivers/media/i2c/adv7511.c
@@ -1927,8 +1927,7 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id *
 
 #if IS_ENABLED(CONFIG_VIDEO_ADV7511_CEC)
        state->cec_adap = cec_allocate_adapter(&adv7511_cec_adap_ops,
-               state, dev_name(&client->dev), CEC_CAP_TRANSMIT |
-               CEC_CAP_LOG_ADDRS | CEC_CAP_PASSTHROUGH | CEC_CAP_RC,
+               state, dev_name(&client->dev), CEC_CAP_DEFAULTS,
                ADV7511_MAX_ADDRS);
        err = PTR_ERR_OR_ZERO(state->cec_adap);
        if (err) {

diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index 660bacb8f7d9d0e86c74d9b78cd88bddecd9482a..324d39bd68d0af1edfbd89a358994cc8184fd57d 100644 (file)
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -3515,8 +3515,7 @@ static int adv76xx_probe(struct i2c_client *client,
 #if IS_ENABLED(CONFIG_VIDEO_ADV7604_CEC)
        state->cec_adap = cec_allocate_adapter(&adv76xx_cec_adap_ops,
                state, dev_name(&client->dev),
-               CEC_CAP_TRANSMIT | CEC_CAP_LOG_ADDRS |
-               CEC_CAP_PASSTHROUGH | CEC_CAP_RC, ADV76XX_MAX_ADDRS);
+               CEC_CAP_DEFAULTS, ADV76XX_MAX_ADDRS);
        err = PTR_ERR_OR_ZERO(state->cec_adap);
        if (err)
                goto err_entity;

diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
index 303effda1a2ec9459b6909ca91dae4971c3c6d60..1bf6129fab62d486968fddde4423a9e452dd4716 100644 (file)
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -3568,8 +3568,7 @@ static int adv7842_probe(struct i2c_client *client,
 #if IS_ENABLED(CONFIG_VIDEO_ADV7842_CEC)
        state->cec_adap = cec_allocate_adapter(&adv7842_cec_adap_ops,
                state, dev_name(&client->dev),
-               CEC_CAP_TRANSMIT | CEC_CAP_LOG_ADDRS |
-               CEC_CAP_PASSTHROUGH | CEC_CAP_RC, ADV7842_MAX_ADDRS);
+               CEC_CAP_DEFAULTS, ADV7842_MAX_ADDRS);
        err = PTR_ERR_OR_ZERO(state->cec_adap);
        if (err)
                goto err_entity;

diff --git a/drivers/media/platform/vivid/vivid-cec.c b/drivers/media/platform/vivid/vivid-cec.c
index e157057589698d698370df824b88bb5ffe1f9c0e..43992fa92a88a1392b6bd5294cc22a833c723822 100644 (file)
--- a/drivers/media/platform/vivid/vivid-cec.c
+++ b/drivers/media/platform/vivid/vivid-cec.c
@@ -219,8 +219,7 @@ struct cec_adapter *vivid_cec_alloc_adap(struct vivid_dev *dev,
                                         bool is_source)
 {
        char name[sizeof(dev->vid_out_dev.name) + 2];
-       u32 caps = CEC_CAP_TRANSMIT | CEC_CAP_LOG_ADDRS |
-               CEC_CAP_PASSTHROUGH | CEC_CAP_RC | CEC_CAP_MONITOR_ALL;
+       u32 caps = CEC_CAP_DEFAULTS | CEC_CAP_MONITOR_ALL;
 
        snprintf(name, sizeof(name), "%s%d",
                 is_source ? dev->vid_out_dev.name : dev->vid_cap_dev.name,

diff --git a/drivers/media/usb/pulse8-cec/pulse8-cec.c b/drivers/media/usb/pulse8-cec/pulse8-cec.c
index 993117c04935f48b83e2361669eee3e545f86aac..95f616f9400491f46b8ae00fd9a98c59d8d9425f 100644 (file)
--- a/drivers/media/usb/pulse8-cec/pulse8-cec.c
+++ b/drivers/media/usb/pulse8-cec/pulse8-cec.c
@@ -642,8 +642,7 @@ static const struct cec_adap_ops pulse8_cec_adap_ops = {
 
 static int pulse8_connect(struct serio *serio, struct serio_driver *drv)
 {
-       u32 caps = CEC_CAP_TRANSMIT | CEC_CAP_LOG_ADDRS | CEC_CAP_PHYS_ADDR |
-               CEC_CAP_PASSTHROUGH | CEC_CAP_RC | CEC_CAP_MONITOR_ALL;
+       u32 caps = CEC_CAP_DEFAULTS | CEC_CAP_PHYS_ADDR | CEC_CAP_MONITOR_ALL;
        struct pulse8 *pulse8;
        int err = -ENOMEM;
        struct cec_log_addrs log_addrs = {};

diff --git a/drivers/media/usb/rainshadow-cec/rainshadow-cec.c b/drivers/media/usb/rainshadow-cec/rainshadow-cec.c
index 30bff4c48f9299c2ea4f08851d9cbad49bea6056..6f9681c995a4d962558c297fb87816ce628e6522 100644 (file)
--- a/drivers/media/usb/rainshadow-cec/rainshadow-cec.c
+++ b/drivers/media/usb/rainshadow-cec/rainshadow-cec.c
@@ -309,8 +309,7 @@ static const struct cec_adap_ops rain_cec_adap_ops = {
 
 static int rain_connect(struct serio *serio, struct serio_driver *drv)
 {
-       u32 caps = CEC_CAP_TRANSMIT | CEC_CAP_LOG_ADDRS | CEC_CAP_PHYS_ADDR |
-               CEC_CAP_PASSTHROUGH | CEC_CAP_RC | CEC_CAP_MONITOR_ALL;
+       u32 caps = CEC_CAP_DEFAULTS | CEC_CAP_PHYS_ADDR | CEC_CAP_MONITOR_ALL;
        struct rain *rain;
        int err = -ENOMEM;
        struct cec_log_addrs log_addrs = {};