Commit a5af9744 authored by Paweł Anikiel's avatar Paweł Anikiel Committed by Hans Verkuil

media: spi: gs1662: Switch dv timing callbacks to pad ops

Change all (s|g|query)_dv_timings subdev callbacks to include
a pad argument.
Signed-off-by: default avatarPaweł Anikiel <panikiel@google.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil: align to open parenthesis]
parent cf709fe3
...@@ -259,12 +259,15 @@ static inline struct gs *to_gs(struct v4l2_subdev *sd) ...@@ -259,12 +259,15 @@ static inline struct gs *to_gs(struct v4l2_subdev *sd)
return container_of(sd, struct gs, sd); return container_of(sd, struct gs, sd);
} }
static int gs_s_dv_timings(struct v4l2_subdev *sd, static int gs_s_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
struct v4l2_dv_timings *timings) struct v4l2_dv_timings *timings)
{ {
struct gs *gs = to_gs(sd); struct gs *gs = to_gs(sd);
int reg_value; int reg_value;
if (pad != 0)
return -EINVAL;
reg_value = get_register_timings(timings); reg_value = get_register_timings(timings);
if (reg_value == 0x0) if (reg_value == 0x0)
return -EINVAL; return -EINVAL;
...@@ -273,23 +276,29 @@ static int gs_s_dv_timings(struct v4l2_subdev *sd, ...@@ -273,23 +276,29 @@ static int gs_s_dv_timings(struct v4l2_subdev *sd,
return 0; return 0;
} }
static int gs_g_dv_timings(struct v4l2_subdev *sd, static int gs_g_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
struct v4l2_dv_timings *timings) struct v4l2_dv_timings *timings)
{ {
struct gs *gs = to_gs(sd); struct gs *gs = to_gs(sd);
if (pad != 0)
return -EINVAL;
*timings = gs->current_timings; *timings = gs->current_timings;
return 0; return 0;
} }
static int gs_query_dv_timings(struct v4l2_subdev *sd, static int gs_query_dv_timings(struct v4l2_subdev *sd, unsigned int pad,
struct v4l2_dv_timings *timings) struct v4l2_dv_timings *timings)
{ {
struct gs *gs = to_gs(sd); struct gs *gs = to_gs(sd);
struct v4l2_dv_timings fmt; struct v4l2_dv_timings fmt;
u16 reg_value, i; u16 reg_value, i;
int ret; int ret;
if (pad != 0)
return -EINVAL;
if (gs->enabled) if (gs->enabled)
return -EBUSY; return -EBUSY;
...@@ -410,14 +419,14 @@ static const struct v4l2_subdev_core_ops gs_core_ops = { ...@@ -410,14 +419,14 @@ static const struct v4l2_subdev_core_ops gs_core_ops = {
}; };
static const struct v4l2_subdev_video_ops gs_video_ops = { static const struct v4l2_subdev_video_ops gs_video_ops = {
.s_dv_timings = gs_s_dv_timings,
.g_dv_timings = gs_g_dv_timings,
.s_stream = gs_s_stream, .s_stream = gs_s_stream,
.g_input_status = gs_g_input_status, .g_input_status = gs_g_input_status,
.query_dv_timings = gs_query_dv_timings,
}; };
static const struct v4l2_subdev_pad_ops gs_pad_ops = { static const struct v4l2_subdev_pad_ops gs_pad_ops = {
.s_dv_timings = gs_s_dv_timings,
.g_dv_timings = gs_g_dv_timings,
.query_dv_timings = gs_query_dv_timings,
.enum_dv_timings = gs_enum_dv_timings, .enum_dv_timings = gs_enum_dv_timings,
.dv_timings_cap = gs_dv_timings_cap, .dv_timings_cap = gs_dv_timings_cap,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment