Commit 4b703b1d authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds

power: axp288_charger: fix for API change

Caused by commit 843735b7 ("power: axp288_charger: axp288 charger
driver") from the battery tree interacting with commit 046050f6
("extcon: Update the prototype of extcon_register_notifier() with enum
extcon") from the extcon tree.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 93f0824c
...@@ -848,7 +848,7 @@ static int axp288_charger_probe(struct platform_device *pdev) ...@@ -848,7 +848,7 @@ static int axp288_charger_probe(struct platform_device *pdev)
/* Register for extcon notification */ /* Register for extcon notification */
INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker); INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker);
info->cable.nb.notifier_call = axp288_charger_handle_cable_evt; 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) { if (ret) {
dev_err(&info->pdev->dev, dev_err(&info->pdev->dev,
"failed to register extcon notifier %d\n", ret); "failed to register extcon notifier %d\n", ret);
...@@ -909,7 +909,7 @@ static int axp288_charger_probe(struct platform_device *pdev) ...@@ -909,7 +909,7 @@ static int axp288_charger_probe(struct platform_device *pdev)
extcon_unregister_interest(&info->otg.cable); extcon_unregister_interest(&info->otg.cable);
power_supply_unregister(info->psy_usb); power_supply_unregister(info->psy_usb);
psy_reg_failed: 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; return ret;
} }
...@@ -920,7 +920,7 @@ static int axp288_charger_remove(struct platform_device *pdev) ...@@ -920,7 +920,7 @@ static int axp288_charger_remove(struct platform_device *pdev)
if (info->otg.cable.edev) if (info->otg.cable.edev)
extcon_unregister_interest(&info->otg.cable); 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); power_supply_unregister(info->psy_usb);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment