mirror of
https://github.com/torvalds/linux.git
synced 2026-06-05 04:56:13 +02:00
media: i2c: adv7511: Switch dv timing callbacks to pad ops
Change all (s|g|query)_dv_timings subdev callbacks to include a pad argument. Signed-off-by: Paweł Anikiel <panikiel@google.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> [hverkuil: align to open parenthesis]
This commit is contained in:
parent
a8ece88ab0
commit
259cadfa40
|
|
@ -995,8 +995,8 @@ static int adv7511_s_stream(struct v4l2_subdev *sd, int enable)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int adv7511_s_dv_timings(struct v4l2_subdev *sd,
|
||||
struct v4l2_dv_timings *timings)
|
||||
static int adv7511_s_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
|
||||
struct v4l2_dv_timings *timings)
|
||||
{
|
||||
struct adv7511_state *state = get_adv7511_state(sd);
|
||||
struct v4l2_bt_timings *bt = &timings->bt;
|
||||
|
|
@ -1004,6 +1004,9 @@ static int adv7511_s_dv_timings(struct v4l2_subdev *sd,
|
|||
|
||||
v4l2_dbg(1, debug, sd, "%s:\n", __func__);
|
||||
|
||||
if (pad != 0)
|
||||
return -EINVAL;
|
||||
|
||||
/* quick sanity check */
|
||||
if (!v4l2_valid_dv_timings(timings, &adv7511_timings_cap, NULL, NULL))
|
||||
return -EINVAL;
|
||||
|
|
@ -1042,13 +1045,16 @@ static int adv7511_s_dv_timings(struct v4l2_subdev *sd,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int adv7511_g_dv_timings(struct v4l2_subdev *sd,
|
||||
static int adv7511_g_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
|
||||
struct v4l2_dv_timings *timings)
|
||||
{
|
||||
struct adv7511_state *state = get_adv7511_state(sd);
|
||||
|
||||
v4l2_dbg(1, debug, sd, "%s:\n", __func__);
|
||||
|
||||
if (pad != 0)
|
||||
return -EINVAL;
|
||||
|
||||
if (!timings)
|
||||
return -EINVAL;
|
||||
|
||||
|
|
@ -1078,8 +1084,6 @@ static int adv7511_dv_timings_cap(struct v4l2_subdev *sd,
|
|||
|
||||
static const struct v4l2_subdev_video_ops adv7511_video_ops = {
|
||||
.s_stream = adv7511_s_stream,
|
||||
.s_dv_timings = adv7511_s_dv_timings,
|
||||
.g_dv_timings = adv7511_g_dv_timings,
|
||||
};
|
||||
|
||||
/* ------------------------------ AUDIO OPS ------------------------------ */
|
||||
|
|
@ -1403,6 +1407,8 @@ static const struct v4l2_subdev_pad_ops adv7511_pad_ops = {
|
|||
.enum_mbus_code = adv7511_enum_mbus_code,
|
||||
.get_fmt = adv7511_get_fmt,
|
||||
.set_fmt = adv7511_set_fmt,
|
||||
.s_dv_timings = adv7511_s_dv_timings,
|
||||
.g_dv_timings = adv7511_g_dv_timings,
|
||||
.enum_dv_timings = adv7511_enum_dv_timings,
|
||||
.dv_timings_cap = adv7511_dv_timings_cap,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user