| Message ID | 20221028160902.2696973-17-dave.stevenson@raspberrypi.com |
|---|---|
| State | Accepted |
| Commit | 34ec724806a2c965b4c1cd9578b16144ba067d3f |
| Headers | show |
| Series | Updates to ov9282 sensor driver | expand |
Hi Dave, On Fri, Oct 28, 2022 at 05:09:02PM +0100, Dave Stevenson wrote: > As noted in the headers for V4L2_SUBDEV_FL_HAS_EVENTS, > "controls can send events, thus drivers exposing controls > should set this flag". > > This driver exposes controls, but didn't reflect that it > could generate events. Correct this, and add the default > event handler functions. > > Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> Sending a tag as I don't see anything worrying, but I'm just not sure how this mechanism is intended to be used, so please wait for others to comment! Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> > --- > drivers/media/i2c/ov9282.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c > index e2a98f480b58..f2ec92deb5ec 100644 > --- a/drivers/media/i2c/ov9282.c > +++ b/drivers/media/i2c/ov9282.c > @@ -13,6 +13,7 @@ > #include <linux/pm_runtime.h> > > #include <media/v4l2-ctrls.h> > +#include <media/v4l2-event.h> > #include <media/v4l2-fwnode.h> > #include <media/v4l2-subdev.h> > > @@ -1161,6 +1162,11 @@ static int ov9282_parse_hw_config(struct ov9282 *ov9282) > } > > /* V4l2 subdevice ops */ > +static const struct v4l2_subdev_core_ops ov9282_core_ops = { > + .subscribe_event = v4l2_ctrl_subdev_subscribe_event, > + .unsubscribe_event = v4l2_event_subdev_unsubscribe, > +}; > + > static const struct v4l2_subdev_video_ops ov9282_video_ops = { > .s_stream = ov9282_set_stream, > }; > @@ -1175,6 +1181,7 @@ static const struct v4l2_subdev_pad_ops ov9282_pad_ops = { > }; > > static const struct v4l2_subdev_ops ov9282_subdev_ops = { > + .core = &ov9282_core_ops, > .video = &ov9282_video_ops, > .pad = &ov9282_pad_ops, > }; > @@ -1389,7 +1396,8 @@ static int ov9282_probe(struct i2c_client *client) > } > > /* Initialize subdev */ > - ov9282->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; > + ov9282->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | > + V4L2_SUBDEV_FL_HAS_EVENTS; > ov9282->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR; > > /* Initialize source pad */ > -- > 2.34.1 >
diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c index e2a98f480b58..f2ec92deb5ec 100644 --- a/drivers/media/i2c/ov9282.c +++ b/drivers/media/i2c/ov9282.c @@ -13,6 +13,7 @@ #include <linux/pm_runtime.h> #include <media/v4l2-ctrls.h> +#include <media/v4l2-event.h> #include <media/v4l2-fwnode.h> #include <media/v4l2-subdev.h> @@ -1161,6 +1162,11 @@ static int ov9282_parse_hw_config(struct ov9282 *ov9282) } /* V4l2 subdevice ops */ +static const struct v4l2_subdev_core_ops ov9282_core_ops = { + .subscribe_event = v4l2_ctrl_subdev_subscribe_event, + .unsubscribe_event = v4l2_event_subdev_unsubscribe, +}; + static const struct v4l2_subdev_video_ops ov9282_video_ops = { .s_stream = ov9282_set_stream, }; @@ -1175,6 +1181,7 @@ static const struct v4l2_subdev_pad_ops ov9282_pad_ops = { }; static const struct v4l2_subdev_ops ov9282_subdev_ops = { + .core = &ov9282_core_ops, .video = &ov9282_video_ops, .pad = &ov9282_pad_ops, }; @@ -1389,7 +1396,8 @@ static int ov9282_probe(struct i2c_client *client) } /* Initialize subdev */ - ov9282->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; + ov9282->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | + V4L2_SUBDEV_FL_HAS_EVENTS; ov9282->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR; /* Initialize source pad */
As noted in the headers for V4L2_SUBDEV_FL_HAS_EVENTS, "controls can send events, thus drivers exposing controls should set this flag". This driver exposes controls, but didn't reflect that it could generate events. Correct this, and add the default event handler functions. Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> --- drivers/media/i2c/ov9282.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)