[media] mt9m001: avoid calling mt9m001_find_datafmt() twice

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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/i2c/soc_camera/mt9m001.c b/drivers/media/i2c/soc_camera/mt9m001.c
index 6d1782b265295560350761cb50f06de3ea022b5d..1bfb0d53059ee803c4499d6bfea58cf652550586 100644 (file)
--- a/drivers/media/i2c/soc_camera/mt9m001.c
+++ b/drivers/media/i2c/soc_camera/mt9m001.c
@@ -278,6 +278,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);
@@ -297,9 +298,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;
@@ -335,7 +335,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;
 }