diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-07-28 13:42:27 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-03 16:28:08 -0400 |
commit | 4a54fab70c97c5a4fabc486946ee8b3c9986f8eb (patch) | |
tree | ad39f5a6d45c1e2ca64d372a17bd79998d8229e0 | |
parent | 3d780ad712d3de61da5ba0ce206a261646dc68dc (diff) |
[media] V4L: rj54n1cb0c: 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/rj54n1cb0c.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/drivers/media/video/rj54n1cb0c.c b/drivers/media/video/rj54n1cb0c.c index d19c79bc0a7f..c30221104c6f 100644 --- a/drivers/media/video/rj54n1cb0c.c +++ b/drivers/media/video/rj54n1cb0c.c | |||
@@ -499,31 +499,6 @@ static int rj54n1_s_stream(struct v4l2_subdev *sd, int enable) | |||
499 | return reg_set(client, RJ54N1_STILL_CONTROL, (!enable) << 7, 0x80); | 499 | return reg_set(client, RJ54N1_STILL_CONTROL, (!enable) << 7, 0x80); |
500 | } | 500 | } |
501 | 501 | ||
502 | static int rj54n1_set_bus_param(struct soc_camera_device *icd, | ||
503 | unsigned long flags) | ||
504 | { | ||
505 | struct v4l2_subdev *sd = soc_camera_to_subdev(icd); | ||
506 | struct i2c_client *client = v4l2_get_subdevdata(sd); | ||
507 | /* Figures 2.5-1 to 2.5-3 - default falling pixclk edge */ | ||
508 | |||
509 | if (flags & SOCAM_PCLK_SAMPLE_RISING) | ||
510 | return reg_write(client, RJ54N1_OUT_SIGPO, 1 << 4); | ||
511 | else | ||
512 | return reg_write(client, RJ54N1_OUT_SIGPO, 0); | ||
513 | } | ||
514 | |||
515 | static unsigned long rj54n1_query_bus_param(struct soc_camera_device *icd) | ||
516 | { | ||
517 | struct soc_camera_link *icl = to_soc_camera_link(icd); | ||
518 | const unsigned long flags = | ||
519 | SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING | | ||
520 | SOCAM_MASTER | SOCAM_DATAWIDTH_8 | | ||
521 | SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH | | ||
522 | SOCAM_DATA_ACTIVE_HIGH; | ||
523 | |||
524 | return soc_camera_apply_sensor_flags(icl, flags); | ||
525 | } | ||
526 | |||
527 | static int rj54n1_set_rect(struct i2c_client *client, | 502 | static int rj54n1_set_rect(struct i2c_client *client, |
528 | u16 reg_x, u16 reg_y, u16 reg_xy, | 503 | u16 reg_x, u16 reg_y, u16 reg_xy, |
529 | u32 width, u32 height) | 504 | u32 width, u32 height) |
@@ -1240,8 +1215,6 @@ static const struct v4l2_queryctrl rj54n1_controls[] = { | |||
1240 | }; | 1215 | }; |
1241 | 1216 | ||
1242 | static struct soc_camera_ops rj54n1_ops = { | 1217 | static struct soc_camera_ops rj54n1_ops = { |
1243 | .set_bus_param = rj54n1_set_bus_param, | ||
1244 | .query_bus_param = rj54n1_query_bus_param, | ||
1245 | .controls = rj54n1_controls, | 1218 | .controls = rj54n1_controls, |
1246 | .num_controls = ARRAY_SIZE(rj54n1_controls), | 1219 | .num_controls = ARRAY_SIZE(rj54n1_controls), |
1247 | }; | 1220 | }; |