* 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; 5+ 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] 5+ 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; 5+ 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] 5+ 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; 5+ 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] 5+ 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; 5+ 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] 5+ messages in thread
* linux-next: build failure after merge of the extcon tree
@ 2019-07-19 0:48 Stephen Rothwell
0 siblings, 0 replies; 5+ 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] 5+ messages in thread
end of thread, other threads:[~2019-07-19 0:49 UTC | newest]
Thread overview: 5+ 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
2019-07-19 0:48 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).