[PATCH v10 10/21] soc-camera: make .clock_{start,stop} compulsory, .add / .remove optional

[Guennadi Liakhovetski]

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.liakhovet...@gmx.de>
---
 drivers/media/platform/soc_camera/soc_camera.c |   27 +++++++++++------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/drivers/media/platform/soc_camera/soc_camera.c 
b/drivers/media/platform/soc_camera/soc_camera.c
index df90565..e503f03 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -513,23 +513,22 @@ static int soc_camera_add_device(struct soc_camera_device 
*icd)
        if (ici->icd)
                return -EBUSY;
 
-       if (ici->ops->clock_start) {
-               ret = ici->ops->clock_start(ici);
+       ret = ici->ops->clock_start(ici);
+       if (ret < 0)
+               return ret;
+
+       if (ici->ops->add) {
+               ret = ici->ops->add(icd);
                if (ret < 0)
-                       return ret;
+                       goto eadd;
        }
 
-       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;
 }
 
@@ -540,9 +539,9 @@ static void soc_camera_remove_device(struct 
soc_camera_device *icd)
        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;
 }
 
@@ -1413,8 +1412,8 @@ int soc_camera_host_register(struct soc_camera_host *ici)
            ((!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;
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html