diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-07-28 13:38:46 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-03 16:27:54 -0400 |
| commit | 5e891294f6dd7af617275477946e75d20c5e8136 (patch) | |
| tree | e3387c09e3fc271c79190777189411a0cfe5a1a5 | |
| parent | 6a34874f9e86e727a9132a52d09b9a62f03bc449 (diff) | |
[media] V4L: mt9m111: 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>
| -rw-r--r-- | drivers/media/video/mt9m111.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c index c9c4655c1fe4..28d447c6d40e 100644 --- a/drivers/media/video/mt9m111.c +++ b/drivers/media/video/mt9m111.c | |||
| @@ -364,21 +364,6 @@ static int mt9m111_reset(struct mt9m111 *mt9m111) | |||
| 364 | return ret; | 364 | return ret; |
| 365 | } | 365 | } |
| 366 | 366 | ||
| 367 | static unsigned long mt9m111_query_bus_param(struct soc_camera_device *icd) | ||
| 368 | { | ||
| 369 | struct soc_camera_link *icl = to_soc_camera_link(icd); | ||
| 370 | unsigned long flags = SOCAM_MASTER | SOCAM_PCLK_SAMPLE_RISING | | ||
| 371 | SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH | | ||
| 372 | SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8; | ||
| 373 | |||
| 374 | return soc_camera_apply_sensor_flags(icl, flags); | ||
| 375 | } | ||
| 376 | |||
| 377 | static int mt9m111_set_bus_param(struct soc_camera_device *icd, unsigned long f) | ||
| 378 | { | ||
| 379 | return 0; | ||
| 380 | } | ||
| 381 | |||
| 382 | static int mt9m111_make_rect(struct mt9m111 *mt9m111, | 367 | static int mt9m111_make_rect(struct mt9m111 *mt9m111, |
| 383 | struct v4l2_rect *rect) | 368 | struct v4l2_rect *rect) |
| 384 | { | 369 | { |
| @@ -699,8 +684,6 @@ static const struct v4l2_queryctrl mt9m111_controls[] = { | |||
| 699 | }; | 684 | }; |
| 700 | 685 | ||
| 701 | static struct soc_camera_ops mt9m111_ops = { | 686 | static struct soc_camera_ops mt9m111_ops = { |
| 702 | .query_bus_param = mt9m111_query_bus_param, | ||
| 703 | .set_bus_param = mt9m111_set_bus_param, | ||
| 704 | .controls = mt9m111_controls, | 687 | .controls = mt9m111_controls, |
| 705 | .num_controls = ARRAY_SIZE(mt9m111_controls), | 688 | .num_controls = ARRAY_SIZE(mt9m111_controls), |
| 706 | }; | 689 | }; |
