diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-07-28 13:42:22 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-03 16:27:56 -0400 |
commit | 0b01e03e5af825303b609f65b7f1a14c07153f18 (patch) | |
tree | f7ae66f2f7bfc05912b237aac68e78161262879d /drivers/media | |
parent | 716eba3ec1d8d89acd19617eb0bd85fc9b58497f (diff) |
[media] V4L: mt9t031: remove superfluous soc-camera client operations
Now that all soc-camera hosts have been ported to use V4L2 subdevice
mediabus-config operations and soc-camera client bus-parameter operations
have been made optional, they can be removed.
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/mt9t031.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/media/video/mt9t031.c b/drivers/media/video/mt9t031.c index c5adb2301480..25fb833f6f2c 100644 --- a/drivers/media/video/mt9t031.c +++ b/drivers/media/video/mt9t031.c | |||
@@ -58,11 +58,6 @@ | |||
58 | #define MT9T031_COLUMN_SKIP 32 | 58 | #define MT9T031_COLUMN_SKIP 32 |
59 | #define MT9T031_ROW_SKIP 20 | 59 | #define MT9T031_ROW_SKIP 20 |
60 | 60 | ||
61 | #define MT9T031_BUS_PARAM (SOCAM_PCLK_SAMPLE_RISING | \ | ||
62 | SOCAM_PCLK_SAMPLE_FALLING | SOCAM_HSYNC_ACTIVE_HIGH | \ | ||
63 | SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_HIGH | \ | ||
64 | SOCAM_MASTER | SOCAM_DATAWIDTH_10) | ||
65 | |||
66 | struct mt9t031 { | 61 | struct mt9t031 { |
67 | struct v4l2_subdev subdev; | 62 | struct v4l2_subdev subdev; |
68 | struct v4l2_rect rect; /* Sensor window */ | 63 | struct v4l2_rect rect; /* Sensor window */ |
@@ -180,30 +175,6 @@ static int mt9t031_s_stream(struct v4l2_subdev *sd, int enable) | |||
180 | return 0; | 175 | return 0; |
181 | } | 176 | } |
182 | 177 | ||
183 | static int mt9t031_set_bus_param(struct soc_camera_device *icd, | ||
184 | unsigned long flags) | ||
185 | { | ||
186 | struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd)); | ||
187 | |||
188 | /* The caller should have queried our parameters, check anyway */ | ||
189 | if (flags & ~MT9T031_BUS_PARAM) | ||
190 | return -EINVAL; | ||
191 | |||
192 | if (flags & SOCAM_PCLK_SAMPLE_FALLING) | ||
193 | reg_clear(client, MT9T031_PIXEL_CLOCK_CONTROL, 0x8000); | ||
194 | else | ||
195 | reg_set(client, MT9T031_PIXEL_CLOCK_CONTROL, 0x8000); | ||
196 | |||
197 | return 0; | ||
198 | } | ||
199 | |||
200 | static unsigned long mt9t031_query_bus_param(struct soc_camera_device *icd) | ||
201 | { | ||
202 | struct soc_camera_link *icl = to_soc_camera_link(icd); | ||
203 | |||
204 | return soc_camera_apply_sensor_flags(icl, MT9T031_BUS_PARAM); | ||
205 | } | ||
206 | |||
207 | enum { | 178 | enum { |
208 | MT9T031_CTRL_VFLIP, | 179 | MT9T031_CTRL_VFLIP, |
209 | MT9T031_CTRL_HFLIP, | 180 | MT9T031_CTRL_HFLIP, |
@@ -263,8 +234,6 @@ static const struct v4l2_queryctrl mt9t031_controls[] = { | |||
263 | }; | 234 | }; |
264 | 235 | ||
265 | static struct soc_camera_ops mt9t031_ops = { | 236 | static struct soc_camera_ops mt9t031_ops = { |
266 | .set_bus_param = mt9t031_set_bus_param, | ||
267 | .query_bus_param = mt9t031_query_bus_param, | ||
268 | .controls = mt9t031_controls, | 237 | .controls = mt9t031_controls, |
269 | .num_controls = ARRAY_SIZE(mt9t031_controls), | 238 | .num_controls = ARRAY_SIZE(mt9t031_controls), |
270 | }; | 239 | }; |