diff options
| author |  Hans Verkuil <hans.verkuil@cisco.com>
| 2015-04-09 04:05:59 -0300 |
|---|---|---|
| committer |  Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| 2015-05-01 09:01:16 -0300 |
| commit | ebf984bb151e9952cccd060d3aba0b4d30a87e81 (patch) | |
| tree | f544881a4285aa026629e9ee094e9c9bdca3f810 /drivers/media/platform/marvell-ccic | |
| parent | [media] v4l2: replace try_mbus_fmt by set_fmt in bridge drivers (diff) | |
| download | linux-ebf984bb151e9952cccd060d3aba0b4d30a87e81.tar.gz linux-ebf984bb151e9952cccd060d3aba0b4d30a87e81.tar.bz2 linux-ebf984bb151e9952cccd060d3aba0b4d30a87e81.zip | |
[media] v4l2: replace s_mbus_fmt by set_fmt in bridge drivers
Replace all calls to s_mbus_fmt in bridge drivers by calls to the
set_fmt pad op.
Remove the old try/s_mbus_fmt video ops since they are now no longer used.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Prabhakar Lad <prabhakar.csengg@gmail.com>
Acked-by: Scott Jiang <scott.jiang.linux@gmail.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/marvell-ccic')
| -rw-r--r-- | drivers/media/platform/marvell-ccic/mcam-core.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c index c2ebc12917a7..2707de8f6245 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.c +++ b/drivers/media/platform/marvell-ccic/mcam-core.c @@ -979,13 +979,15 @@ static int mcam_cam_set_flip(struct mcam_camera *cam) static int mcam_cam_configure(struct mcam_camera *cam) { - struct v4l2_mbus_framefmt mbus_fmt; + struct v4l2_subdev_format format = { + .which = V4L2_SUBDEV_FORMAT_ACTIVE, + }; int ret; - v4l2_fill_mbus_format(&mbus_fmt, &cam->pix_format, cam->mbus_code); + v4l2_fill_mbus_format(&format.format, &cam->pix_format, cam->mbus_code); ret = sensor_call(cam, core, init, 0); if (ret == 0) - ret = sensor_call(cam, video, s_mbus_fmt, &mbus_fmt); + ret = sensor_call(cam, pad, set_fmt, NULL, &format); /* * OV7670 does weird things if flip is set *before* format... */ |