From 4b703b1d4c46ca4a00109ca1a391943ec21991b3 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 25 May 2015 21:00:24 +1000 Subject: [PATCH] power: axp288_charger: fix for API change 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. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds --- 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 @@ static int axp288_charger_probe(struct platform_device *pdev) 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;