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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 2727 bytes --]

Hi all,

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

drivers/staging/media/hantro/hantro_drv.c: In function 'device_run':
drivers/staging/media/hantro/hantro_drv.c:165:3: error: label 'err_cancel_job' used but not defined
  165 |   goto err_cancel_job;
      |   ^~~~
drivers/staging/media/hantro/hantro_drv.c: At top level:
drivers/staging/media/hantro/hantro_drv.c:168:2: warning: data definition has no type or storage class
  168 |  ret = clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks);
      |  ^~~
drivers/staging/media/hantro/hantro_drv.c:168:2: error: type defaults to 'int' in declaration of 'ret' [-Werror=implicit-int]
drivers/staging/media/hantro/hantro_drv.c:168:24: error: 'ctx' undeclared here (not in a function)
  168 |  ret = clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks);
      |                        ^~~
drivers/staging/media/hantro/hantro_drv.c:169:2: error: expected identifier or '(' before 'if'
  169 |  if (ret)
      |  ^~
drivers/staging/media/hantro/hantro_drv.c:172:2: warning: data definition has no type or storage class
  172 |  v4l2_m2m_buf_copy_metadata(src, dst, true);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/staging/media/hantro/hantro_drv.c:172:2: error: type defaults to 'int' in declaration of 'v4l2_m2m_buf_copy_metadata' [-Werror=implicit-int]
drivers/staging/media/hantro/hantro_drv.c:172:2: warning: parameter names (without types) in function declaration
drivers/staging/media/hantro/hantro_drv.c:172:2: error: conflicting types for 'v4l2_m2m_buf_copy_metadata'
In file included from drivers/staging/media/hantro/hantro_drv.c:23:
include/media/v4l2-mem2mem.h:830:6: note: previous declaration of 'v4l2_m2m_buf_copy_metadata' was here
  830 | void v4l2_m2m_buf_copy_metadata(const struct vb2_v4l2_buffer *out_vb,
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/staging/media/hantro/hantro_drv.c:174:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before '->' token
  174 |  ctx->codec_ops->run(ctx);
      |     ^~
drivers/staging/media/hantro/hantro_drv.c:175:2: error: expected identifier or '(' before 'return'
  175 |  return;
      |  ^~~~~~
drivers/staging/media/hantro/hantro_drv.c:177:15: error: expected '=', ',', ';', 'asm' or '__attribute__' before ':' token
  177 | err_cancel_job:
      |               ^
drivers/staging/media/hantro/hantro_drv.c:179:1: error: expected identifier or '(' before '}' token
  179 | }
      | ^

Caused by commit

  9454974c75dd ("media: hantro: use pm_runtime_resume_and_get()")

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

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]