pxa_camera: remove init() callback

pxa_camera init() callback is sometimes abused to setup MFP for PXA CIF, or
even to request GPIOs to be used by the camera *sensor*. These initializations
can be performed statically in machine init functions.

The current semantics for this init() callback is ambiguous anyways, it is
invoked in pxa_camera_activate(), hence at device node open, but its users use
it like a generic initialization to be done at module init time (configure
MFP, request GPIOs for *sensor* control).

Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/arch/arm/mach-pxa/include/mach/camera.h b/arch/arm/mach-pxa/include/mach/camera.h
index 31abe6d514b896b259224cbf48ae01d0213b4893..6709b1cd7c77b7b4eb48b2fc7f7ce208b20a3d94 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/camera.h
+++ b/arch/arm/mach-pxa/include/mach/camera.h
@@ -35,8 +35,6 @@
 #define PXA_CAMERA_VSP         0x400
 
 struct pxacamera_platform_data {
-       int (*init)(struct device *);
-
        unsigned long flags;
        unsigned long mclk_10khz;
 };

diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index 294f860ce2b068f13ba502fc17c1b6b05b9b6dfc..322ac4eecf0ae0cf39b82e33baaa2ef5294a6fe4 100644 (file)
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -898,18 +898,8 @@ static void recalculate_fifo_timeout(struct pxa_camera_dev *pcdev,
 
 static void pxa_camera_activate(struct pxa_camera_dev *pcdev)
 {
-       struct pxacamera_platform_data *pdata = pcdev->pdata;
-       struct device *dev = pcdev->soc_host.v4l2_dev.dev;
        u32 cicr4 = 0;
 
-       dev_dbg(dev, "Registered platform device at %p data %p\n",
-               pcdev, pdata);
-
-       if (pdata && pdata->init) {
-               dev_dbg(dev, "%s: Init gpios\n", __func__);
-               pdata->init(dev);
-       }
-
        /* disable all interrupts */
        __raw_writel(0x3ff, pcdev->base + CICR0);