aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-08-25 10:46:59 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-18 23:19:07 -0400
commitc9c1f1c0dbe90b82939917fdc3e4c9ccad42342d (patch)
tree0a6605999055710b88c71c546f6b2507e675e845 /include/media
parent08590b9613f7f624fe3a052586eea2dbb3584b38 (diff)
V4L/DVB (12530): soc-camera: switch to using v4l2_subdev_call()
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> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/soc_camera.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 0bad8f1d7e8d..344d89904774 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -126,28 +126,34 @@ struct soc_camera_link {
126 void (*free_bus)(struct soc_camera_link *); 126 void (*free_bus)(struct soc_camera_link *);
127}; 127};
128 128
129static inline struct soc_camera_device *to_soc_camera_dev(struct device *dev) 129static inline struct soc_camera_device *to_soc_camera_dev(const struct device *dev)
130{ 130{
131 return container_of(dev, struct soc_camera_device, dev); 131 return container_of(dev, struct soc_camera_device, dev);
132} 132}
133 133
134static inline struct soc_camera_host *to_soc_camera_host(struct device *dev) 134static inline struct soc_camera_host *to_soc_camera_host(const struct device *dev)
135{ 135{
136 struct v4l2_device *v4l2_dev = dev_get_drvdata(dev); 136 struct v4l2_device *v4l2_dev = dev_get_drvdata(dev);
137 137
138 return container_of(v4l2_dev, struct soc_camera_host, v4l2_dev); 138 return container_of(v4l2_dev, struct soc_camera_host, v4l2_dev);
139} 139}
140 140
141static inline struct soc_camera_link *to_soc_camera_link(struct soc_camera_device *icd) 141static inline struct soc_camera_link *to_soc_camera_link(const struct soc_camera_device *icd)
142{ 142{
143 return icd->dev.platform_data; 143 return icd->dev.platform_data;
144} 144}
145 145
146static inline struct device *to_soc_camera_control(struct soc_camera_device *icd) 146static inline struct device *to_soc_camera_control(const struct soc_camera_device *icd)
147{ 147{
148 return dev_get_drvdata(&icd->dev); 148 return dev_get_drvdata(&icd->dev);
149} 149}
150 150
151static inline struct v4l2_subdev *soc_camera_to_subdev(const struct soc_camera_device *icd)
152{
153 struct device *control = to_soc_camera_control(icd);
154 return dev_get_drvdata(control);
155}
156
151int soc_camera_host_register(struct soc_camera_host *ici); 157int soc_camera_host_register(struct soc_camera_host *ici);
152void soc_camera_host_unregister(struct soc_camera_host *ici); 158void soc_camera_host_unregister(struct soc_camera_host *ici);
153 159