diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-04-24 12:55:48 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 18:20:43 -0300 |
| commit | eff505fa1511b753b7cfb397a754b8ff4367cd55 (patch) | |
| tree | 0e15a9094777bbebcfd1331b9e78f1aa6c6a5070 /include/media | |
| parent | eb6c8558f7658b7f31ee022c7bea1d840eda33dc (diff) | |
| download | blackbird-op-linux-eff505fa1511b753b7cfb397a754b8ff4367cd55.tar.gz blackbird-op-linux-eff505fa1511b753b7cfb397a754b8ff4367cd55.zip | |
V4L/DVB (11609): soc-camera: remove an extra device generation from struct soc_camera_host
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/soc_camera.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 396c32550e04..bef5e81d6935 100644 --- a/include/media/soc_camera.h +++ b/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); |
