diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-08-25 10:46:54 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:19:06 -0400 |
commit | 08590b9613f7f624fe3a052586eea2dbb3584b38 (patch) | |
tree | a893d250a4edf84e93794be59e2b1d859314c972 /drivers/media/video/ov772x.c | |
parent | 961801bbb3448a86f0cc93747cecbfae686d81d1 (diff) |
V4L/DVB (12529): soc-camera: switch to s_crop v4l2-subdev video operation
Remove set_crop soc-camera device method and switch to s_crop from v4l2-subdev
video operations. Also extend non-i2c drivers to also hold a pointer to their
v4l2-subdev instance in control device driver-data, i.e., in
dev_get_drvdata((struct device *)to_soc_camera_control(icd))
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ov772x.c')
-rw-r--r-- | drivers/media/video/ov772x.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c index 03488f9e1c88..bbe6f2d71c15 100644 --- a/drivers/media/video/ov772x.c +++ b/drivers/media/video/ov772x.c | |||
@@ -955,24 +955,6 @@ ov772x_set_fmt_error: | |||
955 | return ret; | 955 | return ret; |
956 | } | 956 | } |
957 | 957 | ||
958 | /* Cannot crop, just return the current geometry */ | ||
959 | static int ov772x_set_crop(struct soc_camera_device *icd, | ||
960 | struct v4l2_rect *rect) | ||
961 | { | ||
962 | struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd)); | ||
963 | struct ov772x_priv *priv = to_ov772x(client); | ||
964 | |||
965 | if (!priv->fmt || !priv->win) | ||
966 | return -EINVAL; | ||
967 | |||
968 | rect->left = 0; | ||
969 | rect->top = 0; | ||
970 | rect->width = priv->win->width; | ||
971 | rect->height = priv->win->height; | ||
972 | |||
973 | return 0; | ||
974 | } | ||
975 | |||
976 | static int ov772x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) | 958 | static int ov772x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) |
977 | { | 959 | { |
978 | struct i2c_client *client = sd->priv; | 960 | struct i2c_client *client = sd->priv; |
@@ -1060,7 +1042,6 @@ static int ov772x_video_probe(struct soc_camera_device *icd, | |||
1060 | } | 1042 | } |
1061 | 1043 | ||
1062 | static struct soc_camera_ops ov772x_ops = { | 1044 | static struct soc_camera_ops ov772x_ops = { |
1063 | .set_crop = ov772x_set_crop, | ||
1064 | .set_bus_param = ov772x_set_bus_param, | 1045 | .set_bus_param = ov772x_set_bus_param, |
1065 | .query_bus_param = ov772x_query_bus_param, | 1046 | .query_bus_param = ov772x_query_bus_param, |
1066 | .controls = ov772x_controls, | 1047 | .controls = ov772x_controls, |