Re: linux-next: build failure after merge of the extcon tree

[Stephen Rothwell]

Hi Greg,

On Fri, 5 Jun 2015 19:53:46 +0900 Greg KH <greg@xxxxxxxxx> 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@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx>
> > > Date: Mon, 25 May 2015 21:00:24 +1000
> > > Subject: [PATCH] power: axp288_charger: fix for AIP change
> > > 
> > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > > ---
> > >  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@xxxxxxxxxxxxxxxx>
Date: Mon, 25 May 2015 21:00:24 +1000
Subject: [PATCH] power: axp288_charger: fix for API change

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 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@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/