diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-08-25 16:46:59 +0200 |
---|---|---|
committer | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-08-25 16:46:59 +0200 |
commit | 7cf68de59618e578e4c22038d200ae3f42ad4fbb (patch) | |
tree | b9e14fcb6e38f3896a82b91ba7a8c08acaa99c2a /linux/include/media | |
parent | a94ff67f3f3091badb6034566504ad58206989ef (diff) | |
download | mediapointer-dvb-s2-7cf68de59618e578e4c22038d200ae3f42ad4fbb.tar.gz mediapointer-dvb-s2-7cf68de59618e578e4c22038d200ae3f42ad4fbb.tar.bz2 |
soc-camera: switch to using v4l2_subdev_call()
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Use v4l2_subdev_call() instead of v4l2_device_call_until_err() in all host
drivers and in soc-camera core.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Priority: low
---
drivers/media/video/mx1_camera.c | 12 ++++------
drivers/media/video/mx3_camera.c | 10 ++++----
drivers/media/video/pxa_camera.c | 9 ++++---
drivers/media/video/sh_mobile_ceu_camera.c | 17 ++++++---------
drivers/media/video/soc_camera.c | 30 ++++++++++++++-------------
include/media/soc_camera.h | 14 +++++++++---
6 files changed, 48 insertions(+), 44 deletions(-)
Diffstat (limited to 'linux/include/media')
-rw-r--r-- | linux/include/media/soc_camera.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/linux/include/media/soc_camera.h b/linux/include/media/soc_camera.h index 0bad8f1d7..344d89904 100644 --- a/linux/include/media/soc_camera.h +++ b/linux/include/media/soc_camera.h @@ -126,28 +126,34 @@ struct soc_camera_link { void (*free_bus)(struct soc_camera_link *); }; -static inline struct soc_camera_device *to_soc_camera_dev(struct device *dev) +static inline struct soc_camera_device *to_soc_camera_dev(const struct device *dev) { return container_of(dev, struct soc_camera_device, dev); } -static inline struct soc_camera_host *to_soc_camera_host(struct device *dev) +static inline struct soc_camera_host *to_soc_camera_host(const struct device *dev) { struct v4l2_device *v4l2_dev = dev_get_drvdata(dev); return container_of(v4l2_dev, struct soc_camera_host, v4l2_dev); } -static inline struct soc_camera_link *to_soc_camera_link(struct soc_camera_device *icd) +static inline struct soc_camera_link *to_soc_camera_link(const struct soc_camera_device *icd) { return icd->dev.platform_data; } -static inline struct device *to_soc_camera_control(struct soc_camera_device *icd) +static inline struct device *to_soc_camera_control(const struct soc_camera_device *icd) { return dev_get_drvdata(&icd->dev); } +static inline struct v4l2_subdev *soc_camera_to_subdev(const struct soc_camera_device *icd) +{ + struct device *control = to_soc_camera_control(icd); + return dev_get_drvdata(control); +} + int soc_camera_host_register(struct soc_camera_host *ici); void soc_camera_host_unregister(struct soc_camera_host *ici); |