linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

Hi all,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/staging/media/imx/imx7-media-csi.c: In function 'imx7_csi_set_fmt':
drivers/staging/media/imx/imx7-media-csi.c:1086:11: error: passing argument 2 of 'imx_media_mbus_fmt_to_pix_fmt' from incompatible pointer type [-Werror=incompatible-pointer-types]
           &csi->format_mbus[IMX7_CSI_PAD_SRC],
           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/staging/media/imx/imx7-media-csi.c:30:
drivers/staging/media/imx/imx-media.h:183:25: note: expected 'struct v4l2_rect *' but argument is of type 'struct v4l2_mbus_framefmt *'
       struct v4l2_rect *compose,
       ~~~~~~~~~~~~~~~~~~^~~~~~~
drivers/staging/media/imx/imx7-media-csi.c:1087:18: error: passing argument 3 of 'imx_media_mbus_fmt_to_pix_fmt' from incompatible pointer type [-Werror=incompatible-pointer-types]
           csi->cc[IMX7_CSI_PAD_SRC]);
           ~~~~~~~^~~~~~~~~~~~~~~~~~
In file included from drivers/staging/media/imx/imx7-media-csi.c:30:
drivers/staging/media/imx/imx-media.h:184:40: note: expected 'const struct v4l2_mbus_framefmt *' but argument is of type 'const struct imx_media_pixfmt *'
       const struct v4l2_mbus_framefmt *mbus,
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
drivers/staging/media/imx/imx7-media-csi.c:1085:2: error: too few arguments to function 'imx_media_mbus_fmt_to_pix_fmt'
  imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt,
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/staging/media/imx/imx7-media-csi.c:30:
drivers/staging/media/imx/imx-media.h:182:5: note: declared here
 int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/staging/media/imx/imx7-media-csi.c:1089:2: error: too few arguments to function 'imx_media_capture_device_set_format'
  imx_media_capture_device_set_format(vdev, &vdev_fmt);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/staging/media/imx/imx7-media-csi.c:30:
drivers/staging/media/imx/imx-media.h:278:6: note: declared here
 void imx_media_capture_device_set_format(struct imx_media_video_dev *vdev,
      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  05f634040c0d ("media: staging/imx7: add imx7 CSI subdev driver")

interacting with the earlier commit

  5964cbd86922 ("media: imx: Set capture compose rectangle in capture_device_set_format")

I have used the v4l-dvb tree from next-20190218 for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpi0CbGJh8SG.pgp
Description: OpenPGP digital signature