* [PATCHv2 0/8] soc-camera sensor improvements
@ 2015-05-04 10:25 Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 1/8] imx074: don't call imx074_find_datafmt() twice Hans Verkuil
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Hans Verkuil @ 2015-05-04 10:25 UTC (permalink / raw)
To: linux-media; +Cc: g.liakhovetski
From: Hans Verkuil <hans.verkuil@cisco.com>
As per Guennadi's suggestions, improve the code of various soc-camera sensor
drivers to avoid duplicating code.
Changes since v1:
- Remove unnecessary change in imx074 and ov5642
- Dropped patch 9. It was not needed after all.
Regards,
Hans
Hans Verkuil (8):
imx074: don't call imx074_find_datafmt() twice
mt9m001: avoid calling mt9m001_find_datafmt() twice
mt9v022: avoid calling mt9v022_find_datafmt() twice
ov2640: avoid calling ov2640_select_win() twice
ov5642: avoid calling ov5642_find_datafmt() twice
ov772x: avoid calling ov772x_select_params() twice
ov9640: avoid calling ov9640_res_roundup() twice
ov9740: avoid calling ov9740_res_roundup() twice
drivers/media/i2c/soc_camera/imx074.c | 2 +-
drivers/media/i2c/soc_camera/mt9m001.c | 8 +++----
drivers/media/i2c/soc_camera/mt9v022.c | 8 +++----
drivers/media/i2c/soc_camera/ov2640.c | 21 +++++++++--------
drivers/media/i2c/soc_camera/ov5642.c | 2 +-
drivers/media/i2c/soc_camera/ov772x.c | 41 +++++++++++-----------------------
drivers/media/i2c/soc_camera/ov9640.c | 24 +++-----------------
drivers/media/i2c/soc_camera/ov9740.c | 18 +--------------
8 files changed, 37 insertions(+), 87 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCHv2 1/8] imx074: don't call imx074_find_datafmt() twice
2015-05-04 10:25 [PATCHv2 0/8] soc-camera sensor improvements Hans Verkuil
@ 2015-05-04 10:25 ` Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 2/8] mt9m001: avoid calling mt9m001_find_datafmt() twice Hans Verkuil
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Hans Verkuil @ 2015-05-04 10:25 UTC (permalink / raw)
To: linux-media; +Cc: g.liakhovetski, Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
Simplify imx074_set_fmt().
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/i2c/soc_camera/imx074.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/i2c/soc_camera/imx074.c b/drivers/media/i2c/soc_camera/imx074.c
index f68c235..dabfa3f 100644
--- a/drivers/media/i2c/soc_camera/imx074.c
+++ b/drivers/media/i2c/soc_camera/imx074.c
@@ -180,7 +180,7 @@ static int imx074_set_fmt(struct v4l2_subdev *sd,
mf->field = V4L2_FIELD_NONE;
if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
- priv->fmt = imx074_find_datafmt(mf->code);
+ priv->fmt = fmt;
else
cfg->try_fmt = *mf;
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCHv2 2/8] mt9m001: avoid calling mt9m001_find_datafmt() twice
2015-05-04 10:25 [PATCHv2 0/8] soc-camera sensor improvements Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 1/8] imx074: don't call imx074_find_datafmt() twice Hans Verkuil
@ 2015-05-04 10:25 ` Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 3/8] mt9v022: avoid calling mt9v022_find_datafmt() twice Hans Verkuil
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Hans Verkuil @ 2015-05-04 10:25 UTC (permalink / raw)
To: linux-media; +Cc: g.liakhovetski, Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
Simplify mt9m001_s_fmt and mt9m001_set_fmt.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/i2c/soc_camera/mt9m001.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/media/i2c/soc_camera/mt9m001.c b/drivers/media/i2c/soc_camera/mt9m001.c
index 4fbdd1e..1f49140 100644
--- a/drivers/media/i2c/soc_camera/mt9m001.c
+++ b/drivers/media/i2c/soc_camera/mt9m001.c
@@ -271,6 +271,7 @@ static int mt9m001_get_fmt(struct v4l2_subdev *sd,
}
static int mt9m001_s_fmt(struct v4l2_subdev *sd,
+ const struct mt9m001_datafmt *fmt,
struct v4l2_mbus_framefmt *mf)
{
struct i2c_client *client = v4l2_get_subdevdata(sd);
@@ -290,9 +291,8 @@ static int mt9m001_s_fmt(struct v4l2_subdev *sd,
if (!ret) {
mf->width = mt9m001->rect.width;
mf->height = mt9m001->rect.height;
- mt9m001->fmt = mt9m001_find_datafmt(mf->code,
- mt9m001->fmts, mt9m001->num_fmts);
- mf->colorspace = mt9m001->fmt->colorspace;
+ mt9m001->fmt = fmt;
+ mf->colorspace = fmt->colorspace;
}
return ret;
@@ -328,7 +328,7 @@ static int mt9m001_set_fmt(struct v4l2_subdev *sd,
mf->colorspace = fmt->colorspace;
if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
- return mt9m001_s_fmt(sd, mf);
+ return mt9m001_s_fmt(sd, fmt, mf);
cfg->try_fmt = *mf;
return 0;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCHv2 3/8] mt9v022: avoid calling mt9v022_find_datafmt() twice
2015-05-04 10:25 [PATCHv2 0/8] soc-camera sensor improvements Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 1/8] imx074: don't call imx074_find_datafmt() twice Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 2/8] mt9m001: avoid calling mt9m001_find_datafmt() twice Hans Verkuil
@ 2015-05-04 10:25 ` Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 4/8] ov2640: avoid calling ov2640_select_win() twice Hans Verkuil
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Hans Verkuil @ 2015-05-04 10:25 UTC (permalink / raw)
To: linux-media; +Cc: g.liakhovetski, Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
Simplify mt9v022_s_fmt and mt9v022_set_fmt.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/i2c/soc_camera/mt9v022.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/media/i2c/soc_camera/mt9v022.c b/drivers/media/i2c/soc_camera/mt9v022.c
index f313774..00516bf 100644
--- a/drivers/media/i2c/soc_camera/mt9v022.c
+++ b/drivers/media/i2c/soc_camera/mt9v022.c
@@ -396,6 +396,7 @@ static int mt9v022_get_fmt(struct v4l2_subdev *sd,
}
static int mt9v022_s_fmt(struct v4l2_subdev *sd,
+ const struct mt9v022_datafmt *fmt,
struct v4l2_mbus_framefmt *mf)
{
struct i2c_client *client = v4l2_get_subdevdata(sd);
@@ -434,9 +435,8 @@ static int mt9v022_s_fmt(struct v4l2_subdev *sd,
if (!ret) {
mf->width = mt9v022->rect.width;
mf->height = mt9v022->rect.height;
- mt9v022->fmt = mt9v022_find_datafmt(mf->code,
- mt9v022->fmts, mt9v022->num_fmts);
- mf->colorspace = mt9v022->fmt->colorspace;
+ mt9v022->fmt = fmt;
+ mf->colorspace = fmt->colorspace;
}
return ret;
@@ -471,7 +471,7 @@ static int mt9v022_set_fmt(struct v4l2_subdev *sd,
mf->colorspace = fmt->colorspace;
if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
- return mt9v022_s_fmt(sd, mf);
+ return mt9v022_s_fmt(sd, fmt, mf);
cfg->try_fmt = *mf;
return 0;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCHv2 4/8] ov2640: avoid calling ov2640_select_win() twice
2015-05-04 10:25 [PATCHv2 0/8] soc-camera sensor improvements Hans Verkuil
` (2 preceding siblings ...)
2015-05-04 10:25 ` [PATCHv2 3/8] mt9v022: avoid calling mt9v022_find_datafmt() twice Hans Verkuil
@ 2015-05-04 10:25 ` Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 5/8] ov5642: avoid calling ov5642_find_datafmt() twice Hans Verkuil
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Hans Verkuil @ 2015-05-04 10:25 UTC (permalink / raw)
To: linux-media; +Cc: g.liakhovetski, Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
Simplify ov2640_set_params and ov2640_set_fmt.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/i2c/soc_camera/ov2640.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/media/i2c/soc_camera/ov2640.c b/drivers/media/i2c/soc_camera/ov2640.c
index 9b4f5de..5dcaf24 100644
--- a/drivers/media/i2c/soc_camera/ov2640.c
+++ b/drivers/media/i2c/soc_camera/ov2640.c
@@ -769,15 +769,15 @@ static const struct ov2640_win_size *ov2640_select_win(u32 *width, u32 *height)
return &ov2640_supported_win_sizes[default_size];
}
-static int ov2640_set_params(struct i2c_client *client, u32 *width, u32 *height,
- u32 code)
+static int ov2640_set_params(struct i2c_client *client,
+ const struct ov2640_win_size *win, u32 code)
{
struct ov2640_priv *priv = to_ov2640(client);
const struct regval_list *selected_cfmt_regs;
int ret;
/* select win */
- priv->win = ov2640_select_win(width, height);
+ priv->win = win;
/* select format */
priv->cfmt_code = 0;
@@ -798,6 +798,7 @@ static int ov2640_set_params(struct i2c_client *client, u32 *width, u32 *height,
case MEDIA_BUS_FMT_UYVY8_2X8:
dev_dbg(&client->dev, "%s: Selected cfmt UYVY", __func__);
selected_cfmt_regs = ov2640_uyvy_regs;
+ break;
}
/* reset hardware */
@@ -832,8 +833,6 @@ static int ov2640_set_params(struct i2c_client *client, u32 *width, u32 *height,
goto err;
priv->cfmt_code = code;
- *width = priv->win->width;
- *height = priv->win->height;
return 0;
@@ -887,14 +886,13 @@ static int ov2640_set_fmt(struct v4l2_subdev *sd,
{
struct v4l2_mbus_framefmt *mf = &format->format;
struct i2c_client *client = v4l2_get_subdevdata(sd);
+ const struct ov2640_win_size *win;
if (format->pad)
return -EINVAL;
- /*
- * select suitable win, but don't store it
- */
- ov2640_select_win(&mf->width, &mf->height);
+ /* select suitable win */
+ win = ov2640_select_win(&mf->width, &mf->height);
mf->field = V4L2_FIELD_NONE;
@@ -905,14 +903,15 @@ static int ov2640_set_fmt(struct v4l2_subdev *sd,
break;
default:
mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
+ /* fall through */
case MEDIA_BUS_FMT_YUYV8_2X8:
case MEDIA_BUS_FMT_UYVY8_2X8:
mf->colorspace = V4L2_COLORSPACE_JPEG;
+ break;
}
if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
- return ov2640_set_params(client, &mf->width,
- &mf->height, mf->code);
+ return ov2640_set_params(client, win, mf->code);
cfg->try_fmt = *mf;
return 0;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCHv2 5/8] ov5642: avoid calling ov5642_find_datafmt() twice
2015-05-04 10:25 [PATCHv2 0/8] soc-camera sensor improvements Hans Verkuil
` (3 preceding siblings ...)
2015-05-04 10:25 ` [PATCHv2 4/8] ov2640: avoid calling ov2640_select_win() twice Hans Verkuil
@ 2015-05-04 10:25 ` Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 6/8] ov772x: avoid calling ov772x_select_params() twice Hans Verkuil
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Hans Verkuil @ 2015-05-04 10:25 UTC (permalink / raw)
To: linux-media; +Cc: g.liakhovetski, Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
Simplify ov5642_set_fmt().
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/i2c/soc_camera/ov5642.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/i2c/soc_camera/ov5642.c b/drivers/media/i2c/soc_camera/ov5642.c
index bab9ac0..a3c328c 100644
--- a/drivers/media/i2c/soc_camera/ov5642.c
+++ b/drivers/media/i2c/soc_camera/ov5642.c
@@ -811,7 +811,7 @@ static int ov5642_set_fmt(struct v4l2_subdev *sd,
mf->field = V4L2_FIELD_NONE;
if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
- priv->fmt = ov5642_find_datafmt(mf->code);
+ priv->fmt = fmt;
else
cfg->try_fmt = *mf;
return 0;
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCHv2 6/8] ov772x: avoid calling ov772x_select_params() twice
2015-05-04 10:25 [PATCHv2 0/8] soc-camera sensor improvements Hans Verkuil
` (4 preceding siblings ...)
2015-05-04 10:25 ` [PATCHv2 5/8] ov5642: avoid calling ov5642_find_datafmt() twice Hans Verkuil
@ 2015-05-04 10:25 ` Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 7/8] ov9640: avoid calling ov9640_res_roundup() twice Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 8/8] ov9740: avoid calling ov9740_res_roundup() twice Hans Verkuil
7 siblings, 0 replies; 9+ messages in thread
From: Hans Verkuil @ 2015-05-04 10:25 UTC (permalink / raw)
To: linux-media; +Cc: g.liakhovetski, Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
Merge ov772x_s_fmt into ov772x_set_fmt.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/i2c/soc_camera/ov772x.c | 41 +++++++++++------------------------
1 file changed, 13 insertions(+), 28 deletions(-)
diff --git a/drivers/media/i2c/soc_camera/ov772x.c b/drivers/media/i2c/soc_camera/ov772x.c
index f150a8b..aa32bc5 100644
--- a/drivers/media/i2c/soc_camera/ov772x.c
+++ b/drivers/media/i2c/soc_camera/ov772x.c
@@ -895,38 +895,15 @@ static int ov772x_get_fmt(struct v4l2_subdev *sd,
return 0;
}
-static int ov772x_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
-{
- struct ov772x_priv *priv = to_ov772x(sd);
- const struct ov772x_color_format *cfmt;
- const struct ov772x_win_size *win;
- int ret;
-
- ov772x_select_params(mf, &cfmt, &win);
-
- ret = ov772x_set_params(priv, cfmt, win);
- if (ret < 0)
- return ret;
-
- priv->win = win;
- priv->cfmt = cfmt;
-
- mf->code = cfmt->code;
- mf->width = win->rect.width;
- mf->height = win->rect.height;
- mf->field = V4L2_FIELD_NONE;
- mf->colorspace = cfmt->colorspace;
-
- return 0;
-}
-
static int ov772x_set_fmt(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_format *format)
{
+ struct ov772x_priv *priv = to_ov772x(sd);
struct v4l2_mbus_framefmt *mf = &format->format;
const struct ov772x_color_format *cfmt;
const struct ov772x_win_size *win;
+ int ret;
if (format->pad)
return -EINVAL;
@@ -939,9 +916,17 @@ static int ov772x_set_fmt(struct v4l2_subdev *sd,
mf->field = V4L2_FIELD_NONE;
mf->colorspace = cfmt->colorspace;
- if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
- return ov772x_s_fmt(sd, mf);
- cfg->try_fmt = *mf;
+ if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
+ cfg->try_fmt = *mf;
+ return 0;
+ }
+
+ ret = ov772x_set_params(priv, cfmt, win);
+ if (ret < 0)
+ return ret;
+
+ priv->win = win;
+ priv->cfmt = cfmt;
return 0;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCHv2 7/8] ov9640: avoid calling ov9640_res_roundup() twice
2015-05-04 10:25 [PATCHv2 0/8] soc-camera sensor improvements Hans Verkuil
` (5 preceding siblings ...)
2015-05-04 10:25 ` [PATCHv2 6/8] ov772x: avoid calling ov772x_select_params() twice Hans Verkuil
@ 2015-05-04 10:25 ` Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 8/8] ov9740: avoid calling ov9740_res_roundup() twice Hans Verkuil
7 siblings, 0 replies; 9+ messages in thread
From: Hans Verkuil @ 2015-05-04 10:25 UTC (permalink / raw)
To: linux-media; +Cc: g.liakhovetski, Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
Simplify ov9640_s_fmt and ov9640_set_fmt
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/i2c/soc_camera/ov9640.c | 24 +++---------------------
1 file changed, 3 insertions(+), 21 deletions(-)
diff --git a/drivers/media/i2c/soc_camera/ov9640.c b/drivers/media/i2c/soc_camera/ov9640.c
index 8caae1c..c8ac41e 100644
--- a/drivers/media/i2c/soc_camera/ov9640.c
+++ b/drivers/media/i2c/soc_camera/ov9640.c
@@ -486,11 +486,8 @@ static int ov9640_s_fmt(struct v4l2_subdev *sd,
{
struct i2c_client *client = v4l2_get_subdevdata(sd);
struct ov9640_reg_alt alts = {0};
- enum v4l2_colorspace cspace;
- u32 code = mf->code;
int ret;
- ov9640_res_roundup(&mf->width, &mf->height);
ov9640_alter_regs(mf->code, &alts);
ov9640_reset(client);
@@ -499,24 +496,7 @@ static int ov9640_s_fmt(struct v4l2_subdev *sd,
if (ret)
return ret;
- switch (code) {
- case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE:
- case MEDIA_BUS_FMT_RGB565_2X8_LE:
- cspace = V4L2_COLORSPACE_SRGB;
- break;
- default:
- code = MEDIA_BUS_FMT_UYVY8_2X8;
- case MEDIA_BUS_FMT_UYVY8_2X8:
- cspace = V4L2_COLORSPACE_JPEG;
- }
-
- ret = ov9640_write_regs(client, mf->width, code, &alts);
- if (!ret) {
- mf->code = code;
- mf->colorspace = cspace;
- }
-
- return ret;
+ return ov9640_write_regs(client, mf->width, mf->code, &alts);
}
static int ov9640_set_fmt(struct v4l2_subdev *sd,
@@ -539,8 +519,10 @@ static int ov9640_set_fmt(struct v4l2_subdev *sd,
break;
default:
mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
+ /* fall through */
case MEDIA_BUS_FMT_UYVY8_2X8:
mf->colorspace = V4L2_COLORSPACE_JPEG;
+ break;
}
if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCHv2 8/8] ov9740: avoid calling ov9740_res_roundup() twice
2015-05-04 10:25 [PATCHv2 0/8] soc-camera sensor improvements Hans Verkuil
` (6 preceding siblings ...)
2015-05-04 10:25 ` [PATCHv2 7/8] ov9640: avoid calling ov9640_res_roundup() twice Hans Verkuil
@ 2015-05-04 10:25 ` Hans Verkuil
7 siblings, 0 replies; 9+ messages in thread
From: Hans Verkuil @ 2015-05-04 10:25 UTC (permalink / raw)
To: linux-media; +Cc: g.liakhovetski, Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
Simplify ov9740_s_fmt.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/i2c/soc_camera/ov9740.c | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/drivers/media/i2c/soc_camera/ov9740.c b/drivers/media/i2c/soc_camera/ov9740.c
index 03a7fc7..61a8e18 100644
--- a/drivers/media/i2c/soc_camera/ov9740.c
+++ b/drivers/media/i2c/soc_camera/ov9740.c
@@ -673,20 +673,8 @@ static int ov9740_s_fmt(struct v4l2_subdev *sd,
{
struct i2c_client *client = v4l2_get_subdevdata(sd);
struct ov9740_priv *priv = to_ov9740(sd);
- enum v4l2_colorspace cspace;
- u32 code = mf->code;
int ret;
- ov9740_res_roundup(&mf->width, &mf->height);
-
- switch (code) {
- case MEDIA_BUS_FMT_YUYV8_2X8:
- cspace = V4L2_COLORSPACE_SRGB;
- break;
- default:
- return -EINVAL;
- }
-
ret = ov9740_reg_write_array(client, ov9740_defaults,
ARRAY_SIZE(ov9740_defaults));
if (ret < 0)
@@ -696,11 +684,7 @@ static int ov9740_s_fmt(struct v4l2_subdev *sd,
if (ret < 0)
return ret;
- mf->code = code;
- mf->colorspace = cspace;
-
- memcpy(&priv->current_mf, mf, sizeof(struct v4l2_mbus_framefmt));
-
+ priv->current_mf = *mf;
return ret;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-05-04 10:26 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-04 10:25 [PATCHv2 0/8] soc-camera sensor improvements Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 1/8] imx074: don't call imx074_find_datafmt() twice Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 2/8] mt9m001: avoid calling mt9m001_find_datafmt() twice Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 3/8] mt9v022: avoid calling mt9v022_find_datafmt() twice Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 4/8] ov2640: avoid calling ov2640_select_win() twice Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 5/8] ov5642: avoid calling ov5642_find_datafmt() twice Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 6/8] ov772x: avoid calling ov772x_select_params() twice Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 7/8] ov9640: avoid calling ov9640_res_roundup() twice Hans Verkuil
2015-05-04 10:25 ` [PATCHv2 8/8] ov9740: avoid calling ov9740_res_roundup() twice Hans Verkuil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).