linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: build failure after merge of the extcon tree
@ 2015-05-25 11:05 Stephen Rothwell
  2015-06-04  9:18 ` Stephen Rothwell
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2015-05-25 11:05 UTC (permalink / raw)
  To: Sebastian Reichel, Chanwoo Choi
  Cc: linux-next, linux-kernel, Ramakrishna Pallala, Lee Jones

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

Hi all,

After merging the extcon tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/power/axp288_charger.c: In function 'axp288_charger_probe':
drivers/power/axp288_charger.c:851:8: error: incompatible type for argument 2 of 'extcon_register_notifier'
  ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
        ^
In file included from drivers/power/axp288_charger.c:29:0:
include/linux/extcon.h:240:12: note: expected 'enum extcon' but argument is of type 'struct notifier_block *'
 extern int extcon_register_notifier(struct extcon_dev *edev, enum extcon id,
            ^
drivers/power/axp288_charger.c:851:8: error: too few arguments to function 'extcon_register_notifier'
  ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
        ^
In file included from drivers/power/axp288_charger.c:29:0:
include/linux/extcon.h:240:12: note: declared here
 extern int extcon_register_notifier(struct extcon_dev *edev, enum extcon id,
            ^
drivers/power/axp288_charger.c:912:2: error: incompatible type for argument 2 of 'extcon_unregister_notifier'
  extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
  ^
In file included from drivers/power/axp288_charger.c:29:0:
include/linux/extcon.h:242:12: note: expected 'enum extcon' but argument is of type 'struct notifier_block *'
 extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
            ^
drivers/power/axp288_charger.c:912:2: error: too few arguments to function 'extcon_unregister_notifier'
  extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
  ^
In file included from drivers/power/axp288_charger.c:29:0:
include/linux/extcon.h:242:12: note: declared here
 extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
            ^
drivers/power/axp288_charger.c: In function 'axp288_charger_remove':
drivers/power/axp288_charger.c:923:2: error: incompatible type for argument 2 of 'extcon_unregister_notifier'
  extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
  ^
In file included from drivers/power/axp288_charger.c:29:0:
include/linux/extcon.h:242:12: note: expected 'enum extcon' but argument is of type 'struct notifier_block *'
 extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
            ^
drivers/power/axp288_charger.c:923:2: error: too few arguments to function 'extcon_unregister_notifier'
  extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
  ^
In file included from drivers/power/axp288_charger.c:29:0:
include/linux/extcon.h:242:12: note: declared here
 extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
            ^

Caused by commit 843735b788a4 ("power: axp288_charger: axp288 charger
driver") from the battery tree interacting with commit 046050f6e623
("extcon: Update the prototype of extcon_register_notifier() with enum
extcon") from the extcon tree.

I applied this merge fix patch for tday and can carry it as necessary
(it is clearly not correct, but it will make it build):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 25 May 2015 21:00:24 +1000
Subject: [PATCH] power: axp288_charger: fix for AIP change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/power/axp288_charger.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/power/axp288_charger.c b/drivers/power/axp288_charger.c
index 5680317f4823..e4d569f57acc 100644
--- a/drivers/power/axp288_charger.c
+++ b/drivers/power/axp288_charger.c
@@ -848,7 +848,7 @@ static int axp288_charger_probe(struct platform_device *pdev)
 	/* Register for extcon notification */
 	INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker);
 	info->cable.nb.notifier_call = axp288_charger_handle_cable_evt;
-	ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
+	ret = extcon_register_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
 	if (ret) {
 		dev_err(&info->pdev->dev,
 			"failed to register extcon notifier %d\n", ret);
@@ -909,7 +909,7 @@ intr_reg_failed:
 		extcon_unregister_interest(&info->otg.cable);
 	power_supply_unregister(info->psy_usb);
 psy_reg_failed:
-	extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
+	extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
 	return ret;
 }
 
@@ -920,7 +920,7 @@ static int axp288_charger_remove(struct platform_device *pdev)
 	if (info->otg.cable.edev)
 		extcon_unregister_interest(&info->otg.cable);
 
-	extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
+	extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
 	power_supply_unregister(info->psy_usb);
 
 	return 0;
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: linux-next: build failure after merge of the extcon tree
  2015-05-25 11:05 linux-next: build failure after merge of the extcon tree Stephen Rothwell
@ 2015-06-04  9:18 ` Stephen Rothwell
  2015-06-05 10:53   ` Greg KH
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2015-06-04  9:18 UTC (permalink / raw)
  To: Sebastian Reichel, Chanwoo Choi, Greg KH, Arnd Bergmann
  Cc: linux-next, linux-kernel, Ramakrishna Pallala, Lee Jones

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

Hi all,

This is now needed when the char-misc and battery trees are merged ...

On Mon, 25 May 2015 21:05:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> After merging the extcon tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/power/axp288_charger.c: In function 'axp288_charger_probe':
> drivers/power/axp288_charger.c:851:8: error: incompatible type for argument 2 of 'extcon_register_notifier'
>   ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
>         ^
> In file included from drivers/power/axp288_charger.c:29:0:
> include/linux/extcon.h:240:12: note: expected 'enum extcon' but argument is of type 'struct notifier_block *'
>  extern int extcon_register_notifier(struct extcon_dev *edev, enum extcon id,
>             ^
> drivers/power/axp288_charger.c:851:8: error: too few arguments to function 'extcon_register_notifier'
>   ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
>         ^
> In file included from drivers/power/axp288_charger.c:29:0:
> include/linux/extcon.h:240:12: note: declared here
>  extern int extcon_register_notifier(struct extcon_dev *edev, enum extcon id,
>             ^
> drivers/power/axp288_charger.c:912:2: error: incompatible type for argument 2 of 'extcon_unregister_notifier'
>   extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
>   ^
> In file included from drivers/power/axp288_charger.c:29:0:
> include/linux/extcon.h:242:12: note: expected 'enum extcon' but argument is of type 'struct notifier_block *'
>  extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
>             ^
> drivers/power/axp288_charger.c:912:2: error: too few arguments to function 'extcon_unregister_notifier'
>   extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
>   ^
> In file included from drivers/power/axp288_charger.c:29:0:
> include/linux/extcon.h:242:12: note: declared here
>  extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
>             ^
> drivers/power/axp288_charger.c: In function 'axp288_charger_remove':
> drivers/power/axp288_charger.c:923:2: error: incompatible type for argument 2 of 'extcon_unregister_notifier'
>   extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
>   ^
> In file included from drivers/power/axp288_charger.c:29:0:
> include/linux/extcon.h:242:12: note: expected 'enum extcon' but argument is of type 'struct notifier_block *'
>  extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
>             ^
> drivers/power/axp288_charger.c:923:2: error: too few arguments to function 'extcon_unregister_notifier'
>   extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
>   ^
> In file included from drivers/power/axp288_charger.c:29:0:
> include/linux/extcon.h:242:12: note: declared here
>  extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
>             ^
> 
> Caused by commit 843735b788a4 ("power: axp288_charger: axp288 charger
> driver") from the battery tree interacting with commit 046050f6e623
> ("extcon: Update the prototype of extcon_register_notifier() with enum
> extcon") from the extcon tree.
> 
> I applied this merge fix patch for tday and can carry it as necessary
> (it is clearly not correct, but it will make it build):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 25 May 2015 21:00:24 +1000
> Subject: [PATCH] power: axp288_charger: fix for AIP change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/power/axp288_charger.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/power/axp288_charger.c b/drivers/power/axp288_charger.c
> index 5680317f4823..e4d569f57acc 100644
> --- a/drivers/power/axp288_charger.c
> +++ b/drivers/power/axp288_charger.c
> @@ -848,7 +848,7 @@ static int axp288_charger_probe(struct platform_device *pdev)
>  	/* Register for extcon notification */
>  	INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker);
>  	info->cable.nb.notifier_call = axp288_charger_handle_cable_evt;
> -	ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
> +	ret = extcon_register_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
>  	if (ret) {
>  		dev_err(&info->pdev->dev,
>  			"failed to register extcon notifier %d\n", ret);
> @@ -909,7 +909,7 @@ intr_reg_failed:
>  		extcon_unregister_interest(&info->otg.cable);
>  	power_supply_unregister(info->psy_usb);
>  psy_reg_failed:
> -	extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
> +	extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
>  	return ret;
>  }
>  
> @@ -920,7 +920,7 @@ static int axp288_charger_remove(struct platform_device *pdev)
>  	if (info->otg.cable.edev)
>  		extcon_unregister_interest(&info->otg.cable);
>  
> -	extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
> +	extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
>  	power_supply_unregister(info->psy_usb);
>  
>  	return 0;
> -- 
> 2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: build failure after merge of the extcon tree
  2015-06-04  9:18 ` Stephen Rothwell
@ 2015-06-05 10:53   ` Greg KH
  2015-06-27  0:16     ` Stephen Rothwell
  0 siblings, 1 reply; 9+ messages in thread
From: Greg KH @ 2015-06-05 10:53 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Sebastian Reichel, Chanwoo Choi, Arnd Bergmann, linux-next,
	linux-kernel, Ramakrishna Pallala, Lee Jones

On Thu, Jun 04, 2015 at 07:18:38PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> This is now needed when the char-misc and battery trees are merged ...
> 
> On Mon, 25 May 2015 21:05:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> > 
> > After merging the extcon tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > drivers/power/axp288_charger.c: In function 'axp288_charger_probe':
> > drivers/power/axp288_charger.c:851:8: error: incompatible type for argument 2 of 'extcon_register_notifier'
> >   ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
> >         ^
> > In file included from drivers/power/axp288_charger.c:29:0:
> > include/linux/extcon.h:240:12: note: expected 'enum extcon' but argument is of type 'struct notifier_block *'
> >  extern int extcon_register_notifier(struct extcon_dev *edev, enum extcon id,
> >             ^
> > drivers/power/axp288_charger.c:851:8: error: too few arguments to function 'extcon_register_notifier'
> >   ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
> >         ^
> > In file included from drivers/power/axp288_charger.c:29:0:
> > include/linux/extcon.h:240:12: note: declared here
> >  extern int extcon_register_notifier(struct extcon_dev *edev, enum extcon id,
> >             ^
> > drivers/power/axp288_charger.c:912:2: error: incompatible type for argument 2 of 'extcon_unregister_notifier'
> >   extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
> >   ^
> > In file included from drivers/power/axp288_charger.c:29:0:
> > include/linux/extcon.h:242:12: note: expected 'enum extcon' but argument is of type 'struct notifier_block *'
> >  extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
> >             ^
> > drivers/power/axp288_charger.c:912:2: error: too few arguments to function 'extcon_unregister_notifier'
> >   extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
> >   ^
> > In file included from drivers/power/axp288_charger.c:29:0:
> > include/linux/extcon.h:242:12: note: declared here
> >  extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
> >             ^
> > drivers/power/axp288_charger.c: In function 'axp288_charger_remove':
> > drivers/power/axp288_charger.c:923:2: error: incompatible type for argument 2 of 'extcon_unregister_notifier'
> >   extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
> >   ^
> > In file included from drivers/power/axp288_charger.c:29:0:
> > include/linux/extcon.h:242:12: note: expected 'enum extcon' but argument is of type 'struct notifier_block *'
> >  extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
> >             ^
> > drivers/power/axp288_charger.c:923:2: error: too few arguments to function 'extcon_unregister_notifier'
> >   extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
> >   ^
> > In file included from drivers/power/axp288_charger.c:29:0:
> > include/linux/extcon.h:242:12: note: declared here
> >  extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
> >             ^
> > 
> > Caused by commit 843735b788a4 ("power: axp288_charger: axp288 charger
> > driver") from the battery tree interacting with commit 046050f6e623
> > ("extcon: Update the prototype of extcon_register_notifier() with enum
> > extcon") from the extcon tree.
> > 
> > I applied this merge fix patch for tday and can carry it as necessary
> > (it is clearly not correct, but it will make it build):
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 25 May 2015 21:00:24 +1000
> > Subject: [PATCH] power: axp288_charger: fix for AIP change
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/power/axp288_charger.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/power/axp288_charger.c b/drivers/power/axp288_charger.c
> > index 5680317f4823..e4d569f57acc 100644
> > --- a/drivers/power/axp288_charger.c
> > +++ b/drivers/power/axp288_charger.c
> > @@ -848,7 +848,7 @@ static int axp288_charger_probe(struct platform_device *pdev)
> >  	/* Register for extcon notification */
> >  	INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker);
> >  	info->cable.nb.notifier_call = axp288_charger_handle_cable_evt;
> > -	ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
> > +	ret = extcon_register_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
> >  	if (ret) {
> >  		dev_err(&info->pdev->dev,
> >  			"failed to register extcon notifier %d\n", ret);
> > @@ -909,7 +909,7 @@ intr_reg_failed:
> >  		extcon_unregister_interest(&info->otg.cable);
> >  	power_supply_unregister(info->psy_usb);
> >  psy_reg_failed:
> > -	extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
> > +	extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
> >  	return ret;
> >  }
> >  
> > @@ -920,7 +920,7 @@ static int axp288_charger_remove(struct platform_device *pdev)
> >  	if (info->otg.cable.edev)
> >  		extcon_unregister_interest(&info->otg.cable);
> >  
> > -	extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
> > +	extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
> >  	power_supply_unregister(info->psy_usb);
> >  
> >  	return 0;

I think we are going to have to resolve this when it hits Linus's tree
:(

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: build failure after merge of the extcon tree
  2015-06-05 10:53   ` Greg KH
@ 2015-06-27  0:16     ` Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2015-06-27  0:16 UTC (permalink / raw)
  To: Greg KH, Linus
  Cc: Sebastian Reichel, Chanwoo Choi, Arnd Bergmann, linux-next,
	linux-kernel, Ramakrishna Pallala, Lee Jones

Hi Greg,

On Fri, 5 Jun 2015 19:53:46 +0900 Greg KH <greg@kroah.com> wrote:
>
> On Thu, Jun 04, 2015 at 07:18:38PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > This is now needed when the char-misc and battery trees are merged ...
> > 
> > On Mon, 25 May 2015 21:05:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Hi all,
> > > 
> > > After merging the extcon tree, today's linux-next build (powerpc
> > > allyesconfig) failed like this:
> > > 
> > > drivers/power/axp288_charger.c: In function 'axp288_charger_probe':
> > > drivers/power/axp288_charger.c:851:8: error: incompatible type for argument 2 of 'extcon_register_notifier'
> > >   ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
> > >         ^
> > > In file included from drivers/power/axp288_charger.c:29:0:
> > > include/linux/extcon.h:240:12: note: expected 'enum extcon' but argument is of type 'struct notifier_block *'
> > >  extern int extcon_register_notifier(struct extcon_dev *edev, enum extcon id,
> > >             ^
> > > drivers/power/axp288_charger.c:851:8: error: too few arguments to function 'extcon_register_notifier'
> > >   ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
> > >         ^
> > > In file included from drivers/power/axp288_charger.c:29:0:
> > > include/linux/extcon.h:240:12: note: declared here
> > >  extern int extcon_register_notifier(struct extcon_dev *edev, enum extcon id,
> > >             ^
> > > drivers/power/axp288_charger.c:912:2: error: incompatible type for argument 2 of 'extcon_unregister_notifier'
> > >   extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
> > >   ^
> > > In file included from drivers/power/axp288_charger.c:29:0:
> > > include/linux/extcon.h:242:12: note: expected 'enum extcon' but argument is of type 'struct notifier_block *'
> > >  extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
> > >             ^
> > > drivers/power/axp288_charger.c:912:2: error: too few arguments to function 'extcon_unregister_notifier'
> > >   extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
> > >   ^
> > > In file included from drivers/power/axp288_charger.c:29:0:
> > > include/linux/extcon.h:242:12: note: declared here
> > >  extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
> > >             ^
> > > drivers/power/axp288_charger.c: In function 'axp288_charger_remove':
> > > drivers/power/axp288_charger.c:923:2: error: incompatible type for argument 2 of 'extcon_unregister_notifier'
> > >   extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
> > >   ^
> > > In file included from drivers/power/axp288_charger.c:29:0:
> > > include/linux/extcon.h:242:12: note: expected 'enum extcon' but argument is of type 'struct notifier_block *'
> > >  extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
> > >             ^
> > > drivers/power/axp288_charger.c:923:2: error: too few arguments to function 'extcon_unregister_notifier'
> > >   extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
> > >   ^
> > > In file included from drivers/power/axp288_charger.c:29:0:
> > > include/linux/extcon.h:242:12: note: declared here
> > >  extern int extcon_unregister_notifier(struct extcon_dev *edev, enum extcon id,
> > >             ^
> > > 
> > > Caused by commit 843735b788a4 ("power: axp288_charger: axp288 charger
> > > driver") from the battery tree interacting with commit 046050f6e623
> > > ("extcon: Update the prototype of extcon_register_notifier() with enum
> > > extcon") from the extcon tree.
> > > 
> > > I applied this merge fix patch for tday and can carry it as necessary
> > > (it is clearly not correct, but it will make it build):
> > > 
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Mon, 25 May 2015 21:00:24 +1000
> > > Subject: [PATCH] power: axp288_charger: fix for AIP change
> > > 
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > >  drivers/power/axp288_charger.c | 6 +++---
> > >  1 file changed, 3 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/drivers/power/axp288_charger.c b/drivers/power/axp288_charger.c
> > > index 5680317f4823..e4d569f57acc 100644
> > > --- a/drivers/power/axp288_charger.c
> > > +++ b/drivers/power/axp288_charger.c
> > > @@ -848,7 +848,7 @@ static int axp288_charger_probe(struct platform_device *pdev)
> > >  	/* Register for extcon notification */
> > >  	INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker);
> > >  	info->cable.nb.notifier_call = axp288_charger_handle_cable_evt;
> > > -	ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
> > > +	ret = extcon_register_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
> > >  	if (ret) {
> > >  		dev_err(&info->pdev->dev,
> > >  			"failed to register extcon notifier %d\n", ret);
> > > @@ -909,7 +909,7 @@ intr_reg_failed:
> > >  		extcon_unregister_interest(&info->otg.cable);
> > >  	power_supply_unregister(info->psy_usb);
> > >  psy_reg_failed:
> > > -	extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
> > > +	extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
> > >  	return ret;
> > >  }
> > >  
> > > @@ -920,7 +920,7 @@ static int axp288_charger_remove(struct platform_device *pdev)
> > >  	if (info->otg.cable.edev)
> > >  		extcon_unregister_interest(&info->otg.cable);
> > >  
> > > -	extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
> > > +	extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
> > >  	power_supply_unregister(info->psy_usb);
> > >  
> > >  	return 0;
> 
> I think we are going to have to resolve this when it hits Linus's tree
> :(

We missed this merge resolution - it is now needed in Linus' tree :-(

Linus: here is the patch again:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 25 May 2015 21:00:24 +1000
Subject: [PATCH] power: axp288_charger: fix for API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/power/axp288_charger.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/power/axp288_charger.c b/drivers/power/axp288_charger.c
index 5680317f4823..e4d569f57acc 100644
--- a/drivers/power/axp288_charger.c
+++ b/drivers/power/axp288_charger.c
@@ -848,7 +848,7 @@ static int axp288_charger_probe(struct platform_device *pdev)
 	/* Register for extcon notification */
 	INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker);
 	info->cable.nb.notifier_call = axp288_charger_handle_cable_evt;
-	ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
+	ret = extcon_register_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
 	if (ret) {
 		dev_err(&info->pdev->dev,
 			"failed to register extcon notifier %d\n", ret);
@@ -909,7 +909,7 @@ intr_reg_failed:
 		extcon_unregister_interest(&info->otg.cable);
 	power_supply_unregister(info->psy_usb);
 psy_reg_failed:
-	extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
+	extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
 	return ret;
 }
 
@@ -920,7 +920,7 @@ static int axp288_charger_remove(struct platform_device *pdev)
 	if (info->otg.cable.edev)
 		extcon_unregister_interest(&info->otg.cable);
 
-	extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
+	extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
 	power_supply_unregister(info->psy_usb);
 
 	return 0;
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* linux-next: build failure after merge of the extcon tree
@ 2019-07-19  0:48 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2019-07-19  0:48 UTC (permalink / raw)
  To: Chanwoo Choi
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Linus Walleij

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

Hi all,

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

drivers/extcon/extcon-gpio.c: In function 'gpio_extcon_probe':
drivers/extcon/extcon-gpio.c:83:11: error: 'struct gpio_extcon_data' has no member named 'irq_flags'
  if (!data->irq_flags || data->extcon_id > EXTCON_NONE)
           ^~

Caused by commit

  e49d583d1df7 ("extcon: gpio: Request reasonable interrupts")

I have used the extcon tree from next-20190718 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: build failure after merge of the extcon tree
@ 2024-09-04  5:24 Stephen Rothwell
  2024-09-04  9:24 ` Hans de Goede
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2024-09-04  5:24 UTC (permalink / raw)
  To: Chanwoo Choi, Sebastian Reichel
  Cc: Hans de Goede, Sebastian Reichel, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi all,

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

drivers/extcon/extcon-lc824206xa.c:413:22: error: initialization of 'unsigned int' from 'const enum power_supply_usb_type *' makes integer from pointer without a cast [-Wint-conversion]
  413 |         .usb_types = lc824206xa_psy_usb_types,
      |                      ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/extcon/extcon-lc824206xa.c:413:22: note: (near initialization for 'lc824206xa_psy_desc.usb_types')
drivers/extcon/extcon-lc824206xa.c:413:22: error: initializer element is not computable at load time
drivers/extcon/extcon-lc824206xa.c:413:22: note: (near initialization for 'lc824206xa_psy_desc.usb_types')
drivers/extcon/extcon-lc824206xa.c:414:10: error: 'const struct power_supply_desc' has no member named 'num_usb_types'; did you mean 'usb_types'?
  414 |         .num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
      |          ^~~~~~~~~~~~~
      |          usb_types
In file included from include/linux/kernel.h:16,
                 from include/linux/cpumask.h:11,
                 from arch/x86/include/asm/paravirt.h:21,
                 from arch/x86/include/asm/cpuid.h:62,
                 from arch/x86/include/asm/processor.h:19,
                 from include/linux/sched.h:13,
                 from include/linux/delay.h:23,
                 from drivers/extcon/extcon-lc824206xa.c:20:
include/linux/array_size.h:11:25: error: initialization of 'const enum power_supply_property *' from 'long unsigned int' makes pointer from integer without a cast [-Wint-conversion]
   11 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
      |                         ^
drivers/extcon/extcon-lc824206xa.c:414:26: note: in expansion of macro 'ARRAY_SIZE'
  414 |         .num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
      |                          ^~~~~~~~~~
include/linux/array_size.h:11:25: note: (near initialization for 'lc824206xa_psy_desc.properties')
   11 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
      |                         ^
drivers/extcon/extcon-lc824206xa.c:414:26: note: in expansion of macro 'ARRAY_SIZE'
  414 |         .num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
      |                          ^~~~~~~~~~

Caused by commit

  e508f2606c0b ("extcon: Add LC824206XA microUSB switch driver")

interatcing with commit

  364ea7ccaef9 ("power: supply: Change usb_types from an array into a bitmask")

from the battery tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 4 Sep 2024 15:19:19 +1000
Subject: [PATCH] fix up for "extcon: Add LC824206XA microUSB switch driver"

interacting with "power: supply: Change usb_types from an array into a
bitmask" from het battery tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/extcon/extcon-lc824206xa.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/extcon/extcon-lc824206xa.c b/drivers/extcon/extcon-lc824206xa.c
index d58a2c369018..56938748aea8 100644
--- a/drivers/extcon/extcon-lc824206xa.c
+++ b/drivers/extcon/extcon-lc824206xa.c
@@ -393,14 +393,6 @@ static int lc824206xa_psy_get_prop(struct power_supply *psy,
 	return 0;
 }
 
-static const enum power_supply_usb_type lc824206xa_psy_usb_types[] = {
-	POWER_SUPPLY_USB_TYPE_SDP,
-	POWER_SUPPLY_USB_TYPE_CDP,
-	POWER_SUPPLY_USB_TYPE_DCP,
-	POWER_SUPPLY_USB_TYPE_ACA,
-	POWER_SUPPLY_USB_TYPE_UNKNOWN,
-};
-
 static const enum power_supply_property lc824206xa_psy_props[] = {
 	POWER_SUPPLY_PROP_ONLINE,
 	POWER_SUPPLY_PROP_USB_TYPE,
@@ -410,8 +402,11 @@ static const enum power_supply_property lc824206xa_psy_props[] = {
 static const struct power_supply_desc lc824206xa_psy_desc = {
 	.name = "lc824206xa-charger-detect",
 	.type = POWER_SUPPLY_TYPE_USB,
-	.usb_types = lc824206xa_psy_usb_types,
-	.num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
+	.usb_types = BIT(POWER_SUPPLY_USB_TYPE_SDP) |
+		     BIT(POWER_SUPPLY_USB_TYPE_CDP) |
+		     BIT(POWER_SUPPLY_USB_TYPE_DCP) |
+		     BIT(POWER_SUPPLY_USB_TYPE_ACA) |
+		     BIT(POWER_SUPPLY_USB_TYPE_UNKNOWN),
 	.properties = lc824206xa_psy_props,
 	.num_properties = ARRAY_SIZE(lc824206xa_psy_props),
 	.get_property = lc824206xa_psy_get_prop,
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: linux-next: build failure after merge of the extcon tree
  2024-09-04  5:24 Stephen Rothwell
@ 2024-09-04  9:24 ` Hans de Goede
  2024-09-04 16:18   ` Chanwoo Choi
  0 siblings, 1 reply; 9+ messages in thread
From: Hans de Goede @ 2024-09-04  9:24 UTC (permalink / raw)
  To: Stephen Rothwell, Chanwoo Choi, Sebastian Reichel
  Cc: Sebastian Reichel, Linux Kernel Mailing List,
	Linux Next Mailing List

Hi all,

On 9/4/24 7:24 AM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the extcon tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/extcon/extcon-lc824206xa.c:413:22: error: initialization of 'unsigned int' from 'const enum power_supply_usb_type *' makes integer from pointer without a cast [-Wint-conversion]
>   413 |         .usb_types = lc824206xa_psy_usb_types,
>       |                      ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/extcon/extcon-lc824206xa.c:413:22: note: (near initialization for 'lc824206xa_psy_desc.usb_types')
> drivers/extcon/extcon-lc824206xa.c:413:22: error: initializer element is not computable at load time
> drivers/extcon/extcon-lc824206xa.c:413:22: note: (near initialization for 'lc824206xa_psy_desc.usb_types')
> drivers/extcon/extcon-lc824206xa.c:414:10: error: 'const struct power_supply_desc' has no member named 'num_usb_types'; did you mean 'usb_types'?
>   414 |         .num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
>       |          ^~~~~~~~~~~~~
>       |          usb_types
> In file included from include/linux/kernel.h:16,
>                  from include/linux/cpumask.h:11,
>                  from arch/x86/include/asm/paravirt.h:21,
>                  from arch/x86/include/asm/cpuid.h:62,
>                  from arch/x86/include/asm/processor.h:19,
>                  from include/linux/sched.h:13,
>                  from include/linux/delay.h:23,
>                  from drivers/extcon/extcon-lc824206xa.c:20:
> include/linux/array_size.h:11:25: error: initialization of 'const enum power_supply_property *' from 'long unsigned int' makes pointer from integer without a cast [-Wint-conversion]
>    11 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
>       |                         ^
> drivers/extcon/extcon-lc824206xa.c:414:26: note: in expansion of macro 'ARRAY_SIZE'
>   414 |         .num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
>       |                          ^~~~~~~~~~
> include/linux/array_size.h:11:25: note: (near initialization for 'lc824206xa_psy_desc.properties')
>    11 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
>       |                         ^
> drivers/extcon/extcon-lc824206xa.c:414:26: note: in expansion of macro 'ARRAY_SIZE'
>   414 |         .num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
>       |                          ^~~~~~~~~~
> 
> Caused by commit
> 
>   e508f2606c0b ("extcon: Add LC824206XA microUSB switch driver")
> 
> interatcing with commit
> 
>   364ea7ccaef9 ("power: supply: Change usb_types from an array into a bitmask")
> 
> from the battery tree.

Since I'm the author of both commits this is my bad, sorry.

Stephen, thank you for fixing this in -next.

Chanwoo, Sebastian send a pull-request for an immutable branch with
these changes:

https://lore.kernel.org/linux-pm/ez5ja55dl7w7ynq2wv4efsvvqtk4xyalf4k6agtsuhpgrtlpg3@d6ghlle4cu2q/

Can you please merge the ib-psy-usb-types-signed tag into
extcon.git/extcon-next and then apply Stephen's fix so that Linus
does not get hit by this build error when he merges the extcon
changes for 6.12 ?

Regards,

Hans




> I have applied the following merge fix patch.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 4 Sep 2024 15:19:19 +1000
> Subject: [PATCH] fix up for "extcon: Add LC824206XA microUSB switch driver"
> 
> interacting with "power: supply: Change usb_types from an array into a
> bitmask" from het battery tree.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/extcon/extcon-lc824206xa.c | 15 +++++----------
>  1 file changed, 5 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/extcon/extcon-lc824206xa.c b/drivers/extcon/extcon-lc824206xa.c
> index d58a2c369018..56938748aea8 100644
> --- a/drivers/extcon/extcon-lc824206xa.c
> +++ b/drivers/extcon/extcon-lc824206xa.c
> @@ -393,14 +393,6 @@ static int lc824206xa_psy_get_prop(struct power_supply *psy,
>  	return 0;
>  }
>  
> -static const enum power_supply_usb_type lc824206xa_psy_usb_types[] = {
> -	POWER_SUPPLY_USB_TYPE_SDP,
> -	POWER_SUPPLY_USB_TYPE_CDP,
> -	POWER_SUPPLY_USB_TYPE_DCP,
> -	POWER_SUPPLY_USB_TYPE_ACA,
> -	POWER_SUPPLY_USB_TYPE_UNKNOWN,
> -};
> -

>  static const enum power_supply_property lc824206xa_psy_props[] = {
>  	POWER_SUPPLY_PROP_ONLINE,
>  	POWER_SUPPLY_PROP_USB_TYPE,
> @@ -410,8 +402,11 @@ static const enum power_supply_property lc824206xa_psy_props[] = {
>  static const struct power_supply_desc lc824206xa_psy_desc = {
>  	.name = "lc824206xa-charger-detect",
>  	.type = POWER_SUPPLY_TYPE_USB,
> -	.usb_types = lc824206xa_psy_usb_types,
> -	.num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
> +	.usb_types = BIT(POWER_SUPPLY_USB_TYPE_SDP) |
> +		     BIT(POWER_SUPPLY_USB_TYPE_CDP) |
> +		     BIT(POWER_SUPPLY_USB_TYPE_DCP) |
> +		     BIT(POWER_SUPPLY_USB_TYPE_ACA) |
> +		     BIT(POWER_SUPPLY_USB_TYPE_UNKNOWN),
>  	.properties = lc824206xa_psy_props,
>  	.num_properties = ARRAY_SIZE(lc824206xa_psy_props),
>  	.get_property = lc824206xa_psy_get_prop,


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: build failure after merge of the extcon tree
  2024-09-04  9:24 ` Hans de Goede
@ 2024-09-04 16:18   ` Chanwoo Choi
  0 siblings, 0 replies; 9+ messages in thread
From: Chanwoo Choi @ 2024-09-04 16:18 UTC (permalink / raw)
  To: Hans de Goede, Stephen Rothwell, Chanwoo Choi, Sebastian Reichel
  Cc: Sebastian Reichel, Linux Kernel Mailing List,
	Linux Next Mailing List

24. 9. 4. 18:24에 Hans de Goede 이(가) 쓴 글:
> Hi all,
> 
> On 9/4/24 7:24 AM, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the extcon tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/extcon/extcon-lc824206xa.c:413:22: error: initialization of 'unsigned int' from 'const enum power_supply_usb_type *' makes integer from pointer without a cast [-Wint-conversion]
>>   413 |         .usb_types = lc824206xa_psy_usb_types,
>>       |                      ^~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/extcon/extcon-lc824206xa.c:413:22: note: (near initialization for 'lc824206xa_psy_desc.usb_types')
>> drivers/extcon/extcon-lc824206xa.c:413:22: error: initializer element is not computable at load time
>> drivers/extcon/extcon-lc824206xa.c:413:22: note: (near initialization for 'lc824206xa_psy_desc.usb_types')
>> drivers/extcon/extcon-lc824206xa.c:414:10: error: 'const struct power_supply_desc' has no member named 'num_usb_types'; did you mean 'usb_types'?
>>   414 |         .num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
>>       |          ^~~~~~~~~~~~~
>>       |          usb_types
>> In file included from include/linux/kernel.h:16,
>>                  from include/linux/cpumask.h:11,
>>                  from arch/x86/include/asm/paravirt.h:21,
>>                  from arch/x86/include/asm/cpuid.h:62,
>>                  from arch/x86/include/asm/processor.h:19,
>>                  from include/linux/sched.h:13,
>>                  from include/linux/delay.h:23,
>>                  from drivers/extcon/extcon-lc824206xa.c:20:
>> include/linux/array_size.h:11:25: error: initialization of 'const enum power_supply_property *' from 'long unsigned int' makes pointer from integer without a cast [-Wint-conversion]
>>    11 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
>>       |                         ^
>> drivers/extcon/extcon-lc824206xa.c:414:26: note: in expansion of macro 'ARRAY_SIZE'
>>   414 |         .num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
>>       |                          ^~~~~~~~~~
>> include/linux/array_size.h:11:25: note: (near initialization for 'lc824206xa_psy_desc.properties')
>>    11 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
>>       |                         ^
>> drivers/extcon/extcon-lc824206xa.c:414:26: note: in expansion of macro 'ARRAY_SIZE'
>>   414 |         .num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
>>       |                          ^~~~~~~~~~
>>
>> Caused by commit
>>
>>   e508f2606c0b ("extcon: Add LC824206XA microUSB switch driver")
>>
>> interatcing with commit
>>
>>   364ea7ccaef9 ("power: supply: Change usb_types from an array into a bitmask")
>>
>> from the battery tree.
> 
> Since I'm the author of both commits this is my bad, sorry.
> 
> Stephen, thank you for fixing this in -next.
> 
> Chanwoo, Sebastian send a pull-request for an immutable branch with
> these changes:
> 
> https://lore.kernel.org/linux-pm/ez5ja55dl7w7ynq2wv4efsvvqtk4xyalf4k6agtsuhpgrtlpg3@d6ghlle4cu2q/
> 
> Can you please merge the ib-psy-usb-types-signed tag into
> extcon.git/extcon-next and then apply Stephen's fix so that Linus
> does not get hit by this build error when he merges the extcon
> changes for 6.12 ?

I pulled "tags/ib-psy-usb-types-signed" and pushed it to extcon.git
- git pull git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git tags/ib-psy-usb-types-signed

And I send the fix-up mail as following:
https://lkml.org/lkml/2024/9/5/13

> 
> Regards,
> 
> Hans
> 
> 
> 
> 
>> I have applied the following merge fix patch.
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Wed, 4 Sep 2024 15:19:19 +1000
>> Subject: [PATCH] fix up for "extcon: Add LC824206XA microUSB switch driver"
>>
>> interacting with "power: supply: Change usb_types from an array into a
>> bitmask" from het battery tree.
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>>  drivers/extcon/extcon-lc824206xa.c | 15 +++++----------
>>  1 file changed, 5 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/extcon/extcon-lc824206xa.c b/drivers/extcon/extcon-lc824206xa.c
>> index d58a2c369018..56938748aea8 100644
>> --- a/drivers/extcon/extcon-lc824206xa.c
>> +++ b/drivers/extcon/extcon-lc824206xa.c
>> @@ -393,14 +393,6 @@ static int lc824206xa_psy_get_prop(struct power_supply *psy,
>>  	return 0;
>>  }
>>  
>> -static const enum power_supply_usb_type lc824206xa_psy_usb_types[] = {
>> -	POWER_SUPPLY_USB_TYPE_SDP,
>> -	POWER_SUPPLY_USB_TYPE_CDP,
>> -	POWER_SUPPLY_USB_TYPE_DCP,
>> -	POWER_SUPPLY_USB_TYPE_ACA,
>> -	POWER_SUPPLY_USB_TYPE_UNKNOWN,
>> -};
>> -
> 
>>  static const enum power_supply_property lc824206xa_psy_props[] = {
>>  	POWER_SUPPLY_PROP_ONLINE,
>>  	POWER_SUPPLY_PROP_USB_TYPE,
>> @@ -410,8 +402,11 @@ static const enum power_supply_property lc824206xa_psy_props[] = {
>>  static const struct power_supply_desc lc824206xa_psy_desc = {
>>  	.name = "lc824206xa-charger-detect",
>>  	.type = POWER_SUPPLY_TYPE_USB,
>> -	.usb_types = lc824206xa_psy_usb_types,
>> -	.num_usb_types = ARRAY_SIZE(lc824206xa_psy_usb_types),
>> +	.usb_types = BIT(POWER_SUPPLY_USB_TYPE_SDP) |
>> +		     BIT(POWER_SUPPLY_USB_TYPE_CDP) |
>> +		     BIT(POWER_SUPPLY_USB_TYPE_DCP) |
>> +		     BIT(POWER_SUPPLY_USB_TYPE_ACA) |
>> +		     BIT(POWER_SUPPLY_USB_TYPE_UNKNOWN),
>>  	.properties = lc824206xa_psy_props,
>>  	.num_properties = ARRAY_SIZE(lc824206xa_psy_props),
>>  	.get_property = lc824206xa_psy_get_prop,
> 
> 

-- 
Best Regards,
Samsung Electronics
Chanwoo Choi


^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: build failure after merge of the extcon tree
@ 2025-05-06  6:22 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2025-05-06  6:22 UTC (permalink / raw)
  To: Chanwoo Choi
  Cc: Svyatoslav Ryhel, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi all,

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

drivers/extcon/extcon-max14526.c: In function 'max14526_probe':
drivers/extcon/extcon-max14526.c:252:74: error: conversion from 'long unsigned int' to 'unsigned int' changes value from '18446744073709551614' to '4294967294' [-Werror=overflow]
  252 |         regmap_write_bits(priv->regmap, MAX14526_CONTROL_2, USB_DET_DIS, ~USB_DET_DIS);
cc1: all warnings being treated as errors

Caused by commit

  0367e6929cf6 ("extcon: Add basic support for Maxim MAX14526 MUIC")

18446744073709551614 is 0xFFFFFFFFFFFFFFFE.

I have used the extcon tree from next-20250505 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2025-05-06  6:22 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-25 11:05 linux-next: build failure after merge of the extcon tree Stephen Rothwell
2015-06-04  9:18 ` Stephen Rothwell
2015-06-05 10:53   ` Greg KH
2015-06-27  0:16     ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2019-07-19  0:48 Stephen Rothwell
2024-09-04  5:24 Stephen Rothwell
2024-09-04  9:24 ` Hans de Goede
2024-09-04 16:18   ` Chanwoo Choi
2025-05-06  6:22 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).