[media] V4L: soc-camera: remove soc-camera bus and devices on it

Now that v4l2 subdevices have got their own device objects, having
one more device in soc-camera clients became redundant and confusing.
This patch removes those devices and the soc-camera bus, they used to
reside on.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 3 insertions, 10 deletions

diff --git a/drivers/media/video/ov9740.c b/drivers/media/video/ov9740.c
index ede48f2ed70c..edd1ffcca30b 100644
--- a/drivers/media/video/ov9740.c
+++ b/drivers/media/video/ov9740.c
@@ -898,16 +898,9 @@ static int ov9740_video_probe(struct soc_camera_device *icd,
         u8 modelhi, modello;
         int ret;
 
-        /*
-         * We must have a parent by now. And it cannot be a wrong one.
-         * So this entire test is completely redundant.
-         */
-        if (!icd->dev.parent ||
-            to_soc_camera_host(icd->dev.parent)->nr != icd->iface) {
-                dev_err(&client->dev, "Parent missing or invalid!\n");
-                ret = -ENODEV;
-                goto err;
-        }
+        /* We must have a parent by now. And it cannot be a wrong one. */
+        BUG_ON(!icd->parent ||
+               to_soc_camera_host(icd->parent)->nr != icd->iface);
 
         /*
          * check and show product ID and manufacturer ID