[media] soc-camera: make .clock_{start,stop} compulsory, .add / .remove optional
All existing soc-camera host drivers use .clock_start() and .clock_stop()
callbacks to activate and deactivate their camera interfaces, whereas
.add() and .remove() callbacks are usually dummy. Make the former two
compulsory and the latter two optional.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 3cc0860..24393a1 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -512,23 +512,22 @@
if (ici->icd)
return -EBUSY;
- if (ici->ops->clock_start) {
- ret = ici->ops->clock_start(ici);
- if (ret < 0)
- return ret;
- }
-
- ret = ici->ops->add(icd);
+ ret = ici->ops->clock_start(ici);
if (ret < 0)
- goto eadd;
+ return ret;
+
+ if (ici->ops->add) {
+ ret = ici->ops->add(icd);
+ if (ret < 0)
+ goto eadd;
+ }
ici->icd = icd;
return 0;
eadd:
- if (ici->ops->clock_stop)
- ici->ops->clock_stop(ici);
+ ici->ops->clock_stop(ici);
return ret;
}
@@ -539,9 +538,9 @@
if (WARN_ON(icd != ici->icd))
return;
- ici->ops->remove(icd);
- if (ici->ops->clock_stop)
- ici->ops->clock_stop(ici);
+ if (ici->ops->remove)
+ ici->ops->remove(icd);
+ ici->ops->clock_stop(ici);
ici->icd = NULL;
}
@@ -1383,8 +1382,8 @@
((!ici->ops->init_videobuf ||
!ici->ops->reqbufs) &&
!ici->ops->init_videobuf2) ||
- !ici->ops->add ||
- !ici->ops->remove ||
+ !ici->ops->clock_start ||
+ !ici->ops->clock_stop ||
!ici->ops->poll ||
!ici->v4l2_dev.dev)
return -EINVAL;