diff options
author | Antonio Ospite <ospite@studenti.unina.it> | 2009-11-17 17:04:23 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 13:11:00 -0500 |
commit | 6b727c68ea7083acd008da7c9734a19a4cdd52dc (patch) | |
tree | be6a1a75d9dadc0ab5466b5bb42c55edbc5dbaf2 /drivers/media | |
parent | 81355e40826acea76274c2ef5ff7d156ff28d183 (diff) |
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>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/pxa_camera.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index 294f860ce2b0..322ac4eecf0a 100644 --- 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, | |||
898 | 898 | ||
899 | static void pxa_camera_activate(struct pxa_camera_dev *pcdev) | 899 | static void pxa_camera_activate(struct pxa_camera_dev *pcdev) |
900 | { | 900 | { |
901 | struct pxacamera_platform_data *pdata = pcdev->pdata; | ||
902 | struct device *dev = pcdev->soc_host.v4l2_dev.dev; | ||
903 | u32 cicr4 = 0; | 901 | u32 cicr4 = 0; |
904 | 902 | ||
905 | dev_dbg(dev, "Registered platform device at %p data %p\n", | ||
906 | pcdev, pdata); | ||
907 | |||
908 | if (pdata && pdata->init) { | ||
909 | dev_dbg(dev, "%s: Init gpios\n", __func__); | ||
910 | pdata->init(dev); | ||
911 | } | ||
912 | |||
913 | /* disable all interrupts */ | 903 | /* disable all interrupts */ |
914 | __raw_writel(0x3ff, pcdev->base + CICR0); | 904 | __raw_writel(0x3ff, pcdev->base + CICR0); |
915 | 905 | ||