summaryrefslogtreecommitdiffstats
path: root/drivers/power/supply/isp1704_charger.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/power/supply/isp1704_charger.c')
-rw-r--r--drivers/power/supply/isp1704_charger.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/power/supply/isp1704_charger.c b/drivers/power/supply/isp1704_charger.c
index b6efc454e4..860d8614c9 100644
--- a/drivers/power/supply/isp1704_charger.c
+++ b/drivers/power/supply/isp1704_charger.c
@@ -477,15 +477,13 @@ fail0:
return ret;
}
-static int isp1704_charger_remove(struct platform_device *pdev)
+static void isp1704_charger_remove(struct platform_device *pdev)
{
struct isp1704_charger *isp = platform_get_drvdata(pdev);
usb_unregister_notifier(isp->phy, &isp->nb);
power_supply_unregister(isp->psy);
isp1704_charger_set_power(isp, 0);
-
- return 0;
}
#ifdef CONFIG_OF
@@ -503,7 +501,7 @@ static struct platform_driver isp1704_charger_driver = {
.of_match_table = of_match_ptr(omap_isp1704_of_match),
},
.probe = isp1704_charger_probe,
- .remove = isp1704_charger_remove,
+ .remove_new = isp1704_charger_remove,
};
module_platform_driver(isp1704_charger_driver);