V4L/DVB (8687): soc-camera: Move .power and .reset from soc_camera host to sensor driver

Make .power and .reset callbacks per camera instead of per host, also move
their invocation to camera drivers.

.arch/arm/mach-pxa/include/mach/camera.h    |    2 -

Signed-off-by: Stefan Herbrechtsmeier <hbmeier@hni.uni-paderborn.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 0 insertions, 24 deletions

diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index cf96b2cc4f1c..14569b591388 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -629,17 +629,6 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev)
                 pdata->init(pcdev->dev);
         }
 
-        if (pdata && pdata->power) {
-                dev_dbg(pcdev->dev, "%s: Power on camera\n", __func__);
-                pdata->power(pcdev->dev, 1);
-        }
-
-        if (pdata && pdata->reset) {
-                dev_dbg(pcdev->dev, "%s: Releasing camera reset\n",
-                        __func__);
-                pdata->reset(pcdev->dev, 1);
-        }
-
         CICR0 = 0x3FF;   /* disable all interrupts */
 
         if (pcdev->platform_flags & PXA_CAMERA_PCLK_EN)
@@ -660,20 +649,7 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev)
 
 static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev)
 {
-        struct pxacamera_platform_data *board = pcdev->pdata;
-
         clk_disable(pcdev->clk);
-
-        if (board && board->reset) {
-                dev_dbg(pcdev->dev, "%s: Asserting camera reset\n",
-                        __func__);
-                board->reset(pcdev->dev, 0);
-        }
-
-        if (board && board->power) {
-                dev_dbg(pcdev->dev, "%s: Power off camera\n", __func__);
-                board->power(pcdev->dev, 0);
-        }
 }
 
 static irqreturn_t pxa_camera_irq(int irq, void *data)