Commit 57b79636 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent ee0c503e

drivers/media/i2c/adv7511.c

+1 −2
Original line number Diff line number Diff line
@@ -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) {

drivers/media/i2c/adv7604.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/media/i2c/adv7842.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/media/platform/vivid/vivid-cec.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

drivers/media/usb/pulse8-cec/pulse8-cec.c

+1 −2
Original line number Diff line number Diff line
@@ -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 = {};