From 0ad854915eba288d17a9c9779c8deed831e74fec Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 4 Jul 2012 12:52:46 +0200
Subject: isp: Remove scaler argument to omap3_isp_pipeline_try_format()
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
isp/omap3isp.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/isp/omap3isp.c b/isp/omap3isp.c
index 1e6f317..7a2d8c0 100644
--- a/isp/omap3isp.c
+++ b/isp/omap3isp.c
@@ -618,8 +618,7 @@ done:
static int omap3_isp_pipeline_try_format(struct omap3_isp_device *isp,
struct omap3_isp_pipeline *pipe,
struct v4l2_rect *crop,
- struct v4l2_mbus_framefmt *ofmt,
- enum omap3_isp_scaler scaler)
+ struct v4l2_mbus_framefmt *ofmt)
{
struct v4l2_mbus_framefmt format;
struct v4l2_pix_format v4l2_fmt;
@@ -638,7 +637,7 @@ static int omap3_isp_pipeline_try_format(struct omap3_isp_device *isp,
/* When scaling on the ISP, select the sensor default output format.
* Otherwise scale as much as possible on the sensor.
*/
- if (scaler == OMAP3_ISP_SCALER_ISP)
+ if (pipe->scaler == OMAP3_ISP_SCALER_ISP)
format = isp->sensor.format;
else
format = *ofmt;
@@ -1166,8 +1165,7 @@ int omap3_isp_viewfinder_setup(struct omap3_isp_device *isp,
isp->viewfinder.scaler = OMAP3_ISP_SCALER_ISP;
/* Try the format. */
- ret = omap3_isp_pipeline_try_format(isp, &isp->viewfinder, NULL, ofmt,
- isp->viewfinder.scaler);
+ ret = omap3_isp_pipeline_try_format(isp, &isp->viewfinder, NULL, ofmt);
if (ret < 0)
return ret;
@@ -1223,8 +1221,7 @@ int omap3_isp_viewfinder_set_scaler(struct omap3_isp_device *isp,
/* Try the format. */
format = isp->viewfinder.output->format;
- ret = omap3_isp_pipeline_try_format(isp, &isp->viewfinder, NULL, &format,
- isp->viewfinder.scaler);
+ ret = omap3_isp_pipeline_try_format(isp, &isp->viewfinder, NULL, &format);
if (ret < 0)
return ret;
@@ -1356,8 +1353,7 @@ int omap3_isp_snapshot_setup(struct omap3_isp_device *isp,
isp->snapshot.scaler = OMAP3_ISP_SCALER_ISP;
/* Try the format. */
- ret = omap3_isp_pipeline_try_format(isp, &isp->snapshot, crop, ofmt,
- OMAP3_ISP_SCALER_ISP);
+ ret = omap3_isp_pipeline_try_format(isp, &isp->snapshot, crop, ofmt);
if (ret < 0)
return ret;
--
cgit v1.2.3