The subdev notifier handling assumes a 1:1 mapping between CAL contexts
and notifiers. To prepare for merging the multiple notifiers into a
single one, retrieve the CAL context from the async subdev structure
instead of from the notifier.
Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
---
drivers/media/platform/ti-vpe/cal.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 52f6d4b68169..0ae88f3593c6 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -2104,11 +2104,22 @@ static void cal_ctx_v4l2_cleanup(struct cal_ctx *ctx)
* ------------------------------------------------------------------
*/
+struct cal_v4l2_async_subdev {
+ struct v4l2_async_subdev asd;
+ struct cal_ctx *ctx;
+};
+
+static inline struct cal_v4l2_async_subdev *
+to_cal_asd(struct v4l2_async_subdev *asd)
+{
+ return container_of(asd, struct cal_v4l2_async_subdev, asd);
+}
+
static int cal_async_bound(struct v4l2_async_notifier *notifier,
struct v4l2_subdev *subdev,
struct v4l2_async_subdev *asd)
{
- struct cal_ctx *ctx = notifier_to_ctx(notifier);
+ struct cal_ctx *ctx = to_cal_asd(asd)->ctx;
if (ctx->phy->sensor) {
ctx_info(ctx, "Rejecting subdev %s (Already set!!)",
@@ -2137,6 +2148,7 @@ static const struct v4l2_async_notifier_operations cal_async_ops = {
static int of_cal_create_instance(struct cal_ctx *ctx, int inst)
{
+ struct cal_v4l2_async_subdev *casd;
struct v4l2_async_subdev *asd;
struct fwnode_handle *fwnode;
int ret;
@@ -2152,6 +2164,9 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst)
return PTR_ERR(asd);
}
+ casd = to_cal_asd(asd);
+ casd->ctx = ctx;
+
ret = v4l2_async_notifier_register(&ctx->cal->v4l2_dev,
&ctx->notifier);
if (ret) {
--
Regards,
Laurent Pinchart
