linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

This is now a semantic conflict between the drm and v4l-dvb trees.

On Tue, 8 Oct 2019 10:30:45 +1100 Stephen Rothwell <sfr at canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:

drivers/media/platform/cec-gpio/cec-gpio.c: In function 'cec_gpio_probe':
drivers/media/platform/cec-gpio/cec-gpio.c:262:2: error: too few arguments to function 'cec_notifier_cec_adap_unregister'
  262 |  cec_notifier_cec_adap_unregister(cec->notifier);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/media/platform/cec-gpio/cec-gpio.c:11:
include/media/cec-notifier.h:98:6: note: declared here
   98 | void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/cec-gpio/cec-gpio.c: In function 'cec_gpio_remove':
drivers/media/platform/cec-gpio/cec-gpio.c:272:2: error: too few arguments to function 'cec_notifier_cec_adap_unregister'
  272 |  cec_notifier_cec_adap_unregister(cec->notifier);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/media/platform/cec-gpio/cec-gpio.c:11:
include/media/cec-notifier.h:98:6: note: declared here
   98 | void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

> Caused by commit
> 
>   10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()")
> 
> interacting with commit
> 
>   7e86efa2ff03 ("media: cec-gpio: add notifier support")
> 
> form the v4l-dvb tree.
> 
> I have applied the following merge fix patch.
> 
> From: Stephen Rothwell <sfr at canb.auug.org.au>
> Date: Tue, 8 Oct 2019 10:26:05 +1100
> Subject: [PATCH] cec: fix up for "cec: add cec_adapter to
>  cec_notifier_cec_adap_unregister()"
> 
> Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
> ---
>  drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/platform/cec-gpio/cec-gpio.c
> index 7be91e712c4a..42d2c2cd9a78 100644
> --- a/drivers/media/platform/cec-gpio/cec-gpio.c
> +++ b/drivers/media/platform/cec-gpio/cec-gpio.c
> @@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev)
>  	return 0;
>  
>  unreg_notifier:
> -	cec_notifier_cec_adap_unregister(cec->notifier);
> +	cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
>  del_adap:
>  	cec_delete_adapter(cec->adap);
>  	return ret;
> @@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev)
>  {
>  	struct cec_gpio *cec = platform_get_drvdata(pdev);
>  
> -	cec_notifier_cec_adap_unregister(cec->notifier);
> +	cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
>  	cec_unregister_adapter(cec->adap);
>  	return 0;
>  }

-- 
Cheers,
Stephen Rothwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20191014/663222c1/attachment-0001.sig>