diff options
author | Sakari Ailus <sakari.ailus@iki.fi> | 2012-05-17 16:50:45 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-06 19:14:39 -0400 |
commit | 1ec0ed083988ae433305d7f4158fda8c3a1a23b9 (patch) | |
tree | aad35d1ee8bed6a1851fdffa7a4ffd9570f17787 /drivers/media/video/omap3isp | |
parent | c133482300113b3b71fa4a1fd2118531e765b36a (diff) |
[media] v4l: Remove "_ACTUAL" from subdev selection API target definition names
The string "_ACTUAL" does not say anything more about the target names. Drop
it. V4L2 selection API was changed by "V4L: Remove "_ACTIVE" from the
selection target name definitions" by Sylwester Nawrocki. This patch does
the same for the V4L2 subdev API.
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/omap3isp')
-rw-r--r-- | drivers/media/video/omap3isp/ispccdc.c | 4 | ||||
-rw-r--r-- | drivers/media/video/omap3isp/isppreview.c | 4 | ||||
-rw-r--r-- | drivers/media/video/omap3isp/ispresizer.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c index 7e32331b60fb..f19774f8396a 100644 --- a/drivers/media/video/omap3isp/ispccdc.c +++ b/drivers/media/video/omap3isp/ispccdc.c | |||
@@ -2024,7 +2024,7 @@ static int ccdc_get_selection(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, | |||
2024 | ccdc_try_crop(ccdc, format, &sel->r); | 2024 | ccdc_try_crop(ccdc, format, &sel->r); |
2025 | break; | 2025 | break; |
2026 | 2026 | ||
2027 | case V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL: | 2027 | case V4L2_SUBDEV_SEL_TGT_CROP: |
2028 | sel->r = *__ccdc_get_crop(ccdc, fh, sel->which); | 2028 | sel->r = *__ccdc_get_crop(ccdc, fh, sel->which); |
2029 | break; | 2029 | break; |
2030 | 2030 | ||
@@ -2052,7 +2052,7 @@ static int ccdc_set_selection(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, | |||
2052 | struct isp_ccdc_device *ccdc = v4l2_get_subdevdata(sd); | 2052 | struct isp_ccdc_device *ccdc = v4l2_get_subdevdata(sd); |
2053 | struct v4l2_mbus_framefmt *format; | 2053 | struct v4l2_mbus_framefmt *format; |
2054 | 2054 | ||
2055 | if (sel->target != V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL || | 2055 | if (sel->target != V4L2_SUBDEV_SEL_TGT_CROP || |
2056 | sel->pad != CCDC_PAD_SOURCE_OF) | 2056 | sel->pad != CCDC_PAD_SOURCE_OF) |
2057 | return -EINVAL; | 2057 | return -EINVAL; |
2058 | 2058 | ||
diff --git a/drivers/media/video/omap3isp/isppreview.c b/drivers/media/video/omap3isp/isppreview.c index 8a4935ecc655..1086f6a9ff76 100644 --- a/drivers/media/video/omap3isp/isppreview.c +++ b/drivers/media/video/omap3isp/isppreview.c | |||
@@ -1960,7 +1960,7 @@ static int preview_get_selection(struct v4l2_subdev *sd, | |||
1960 | preview_try_crop(prev, format, &sel->r); | 1960 | preview_try_crop(prev, format, &sel->r); |
1961 | break; | 1961 | break; |
1962 | 1962 | ||
1963 | case V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL: | 1963 | case V4L2_SUBDEV_SEL_TGT_CROP: |
1964 | sel->r = *__preview_get_crop(prev, fh, sel->which); | 1964 | sel->r = *__preview_get_crop(prev, fh, sel->which); |
1965 | break; | 1965 | break; |
1966 | 1966 | ||
@@ -1988,7 +1988,7 @@ static int preview_set_selection(struct v4l2_subdev *sd, | |||
1988 | struct isp_prev_device *prev = v4l2_get_subdevdata(sd); | 1988 | struct isp_prev_device *prev = v4l2_get_subdevdata(sd); |
1989 | struct v4l2_mbus_framefmt *format; | 1989 | struct v4l2_mbus_framefmt *format; |
1990 | 1990 | ||
1991 | if (sel->target != V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL || | 1991 | if (sel->target != V4L2_SUBDEV_SEL_TGT_CROP || |
1992 | sel->pad != PREV_PAD_SINK) | 1992 | sel->pad != PREV_PAD_SINK) |
1993 | return -EINVAL; | 1993 | return -EINVAL; |
1994 | 1994 | ||
diff --git a/drivers/media/video/omap3isp/ispresizer.c b/drivers/media/video/omap3isp/ispresizer.c index 14041c9c8643..945665295571 100644 --- a/drivers/media/video/omap3isp/ispresizer.c +++ b/drivers/media/video/omap3isp/ispresizer.c | |||
@@ -1259,7 +1259,7 @@ static int resizer_get_selection(struct v4l2_subdev *sd, | |||
1259 | resizer_calc_ratios(res, &sel->r, format_source, &ratio); | 1259 | resizer_calc_ratios(res, &sel->r, format_source, &ratio); |
1260 | break; | 1260 | break; |
1261 | 1261 | ||
1262 | case V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL: | 1262 | case V4L2_SUBDEV_SEL_TGT_CROP: |
1263 | sel->r = *__resizer_get_crop(res, fh, sel->which); | 1263 | sel->r = *__resizer_get_crop(res, fh, sel->which); |
1264 | resizer_calc_ratios(res, &sel->r, format_source, &ratio); | 1264 | resizer_calc_ratios(res, &sel->r, format_source, &ratio); |
1265 | break; | 1265 | break; |
@@ -1293,7 +1293,7 @@ static int resizer_set_selection(struct v4l2_subdev *sd, | |||
1293 | struct v4l2_mbus_framefmt *format_sink, *format_source; | 1293 | struct v4l2_mbus_framefmt *format_sink, *format_source; |
1294 | struct resizer_ratio ratio; | 1294 | struct resizer_ratio ratio; |
1295 | 1295 | ||
1296 | if (sel->target != V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL || | 1296 | if (sel->target != V4L2_SUBDEV_SEL_TGT_CROP || |
1297 | sel->pad != RESZ_PAD_SINK) | 1297 | sel->pad != RESZ_PAD_SINK) |
1298 | return -EINVAL; | 1298 | return -EINVAL; |
1299 | 1299 | ||