summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-04-24 17:55:48 +0200
committerGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-04-24 17:55:48 +0200
commit0d6bf4267e7a2b8a78e1e92da9a4545bc82d29c5 (patch)
treea47763b4d5d0730985a55e44624858da948d680b /linux/include
parent217174ee3676b072ebdb35e23c59dea90d1894dd (diff)
downloadmediapointer-dvb-s2-0d6bf4267e7a2b8a78e1e92da9a4545bc82d29c5.tar.gz
mediapointer-dvb-s2-0d6bf4267e7a2b8a78e1e92da9a4545bc82d29c5.tar.bz2
soc-camera: remove an extra device generation from struct soc_camera_host
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Make camera devices direct children of host platform devices, move the inheritance management into the soc_camera.c core driver. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- drivers/media/video/mx1_camera.c | 35 +++++----- drivers/media/video/mx3_camera.c | 40 ++++++------ drivers/media/video/pxa_camera.c | 97 ++++++++++++++-------------- drivers/media/video/sh_mobile_ceu_camera.c | 21 +++--- drivers/media/video/soc_camera.c | 35 +++------- include/media/soc_camera.h | 4 +- 6 files changed, 107 insertions(+), 125 deletions(-)
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/media/soc_camera.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/include/media/soc_camera.h b/linux/include/media/soc_camera.h
index 396c32550..bef5e81d6 100644
--- a/linux/include/media/soc_camera.h
+++ b/linux/include/media/soc_camera.h
@@ -60,7 +60,7 @@ struct soc_camera_file {
struct soc_camera_host {
struct list_head list;
- struct device dev;
+ struct device *dev;
unsigned char nr; /* Host number */
void *priv;
const char *drv_name;
@@ -117,7 +117,7 @@ static inline struct soc_camera_device *to_soc_camera_dev(struct device *dev)
static inline struct soc_camera_host *to_soc_camera_host(struct device *dev)
{
- return container_of(dev, struct soc_camera_host, dev);
+ return dev_get_drvdata(dev);
}
extern int soc_camera_host_register(struct soc_camera_host *ici);