Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[media] media/i2c/adv*: make controls inheritable instead of private 



Marking these controls as private seemed a good idea at one time,
but in practice it makes no sense. So drop this.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent c040a71f

drivers/media/i2c/ad9389b.c

+0 −8
Original line number Diff line number Diff line
@@ -1130,8 +1130,6 @@ static int ad9389b_probe(struct i2c_client *client, const struct i2c_device_id * 
	hdl = &state->hdl;

	v4l2_ctrl_handler_init(hdl, 5);



	/* private controls */



	state->hdmi_mode_ctrl = v4l2_ctrl_new_std_menu(hdl, &ad9389b_ctrl_ops,

			V4L2_CID_DV_TX_MODE, V4L2_DV_TX_MODE_HDMI,

			0, V4L2_DV_TX_MODE_DVI_D);
@@ -1151,12 +1149,6 @@ static int ad9389b_probe(struct i2c_client *client, const struct i2c_device_id * 


		goto err_hdl;

	}

	state->hdmi_mode_ctrl->is_private = true;

	state->hotplug_ctrl->is_private = true;

	state->rx_sense_ctrl->is_private = true;

	state->have_edid0_ctrl->is_private = true;

	state->rgb_quantization_range_ctrl->is_private = true;



	state->pad.flags = MEDIA_PAD_FL_SINK;

	err = media_entity_pads_init(&sd->entity, 1, &state->pad);

	if (err)

drivers/media/i2c/adv7511.c

+0 −6
Original line number Diff line number Diff line
@@ -1502,12 +1502,6 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id * 
		err = hdl->error;

		goto err_hdl;

	}

	state->hdmi_mode_ctrl->is_private = true;

	state->hotplug_ctrl->is_private = true;

	state->rx_sense_ctrl->is_private = true;

	state->have_edid0_ctrl->is_private = true;

	state->rgb_quantization_range_ctrl->is_private = true;



	state->pad.flags = MEDIA_PAD_FL_SINK;

	err = media_entity_pads_init(&sd->entity, 1, &state->pad);

	if (err)

drivers/media/i2c/adv7604.c

+0 −8
Original line number Diff line number Diff line
@@ -3141,7 +3141,6 @@ static int adv76xx_probe(struct i2c_client *client, 
	if (ctrl)

		ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;



	/* private controls */

	state->detect_tx_5v_ctrl = v4l2_ctrl_new_std(hdl, NULL,

			V4L2_CID_DV_RX_POWER_PRESENT, 0,

			(1 << state->info->num_dv_ports) - 1, 0, 0);
@@ -3164,13 +3163,6 @@ static int adv76xx_probe(struct i2c_client *client, 
		err = hdl->error;

		goto err_hdl;

	}

	state->detect_tx_5v_ctrl->is_private = true;

	state->rgb_quantization_range_ctrl->is_private = true;

	if (adv76xx_has_afe(state))

		state->analog_sampling_phase_ctrl->is_private = true;

	state->free_run_color_manual_ctrl->is_private = true;

	state->free_run_color_ctrl->is_private = true;



	if (adv76xx_s_detect_tx_5v_ctrl(sd)) {

		err = -ENODEV;

		goto err_hdl;

drivers/media/i2c/adv7842.c

+0 −6
Original line number Diff line number Diff line
@@ -3300,12 +3300,6 @@ static int adv7842_probe(struct i2c_client *client, 
		err = hdl->error;

		goto err_hdl;

	}

	state->detect_tx_5v_ctrl->is_private = true;

	state->rgb_quantization_range_ctrl->is_private = true;

	state->analog_sampling_phase_ctrl->is_private = true;

	state->free_run_color_ctrl_manual->is_private = true;

	state->free_run_color_ctrl->is_private = true;



	if (adv7842_s_detect_tx_5v_ctrl(sd)) {

		err = -ENODEV;

		goto err_hdl;