rtc/mc13xxx: add support for the rtc in the mc34708 pmic

[firefly-linux-kernel-4.4.55.git] / drivers / power / ab8500_charger.c

diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index d2303d0b7c755669f7ab48b968e062474241997b..d4f0c98428cbacbef7767c8d375867aaf87cf529 100644 (file)
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -2517,7 +2517,7 @@ static int __devexit ab8500_charger_remove(struct platform_device *pdev)
                dev_err(di->dev, "%s mask and set failed\n", __func__);
 
        usb_unregister_notifier(di->usb_phy, &di->nb);
-       usb_put_transceiver(di->usb_phy);
+       usb_put_phy(di->usb_phy);
 
        /* Delete the work queue */
        destroy_workqueue(di->charger_wq);
@@ -2688,8 +2688,8 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)
                goto free_ac;
        }
 
-       di->usb_phy = usb_get_transceiver();
-       if (!di->usb_phy) {
+       di->usb_phy = usb_get_phy(USB_PHY_TYPE_USB2);
+       if (IS_ERR_OR_NULL(di->usb_phy)) {
                dev_err(di->dev, "failed to get usb transceiver\n");
                ret = -EINVAL;
                goto free_usb;
@@ -2747,7 +2747,7 @@ free_irq:
                free_irq(irq, di);
        }
 put_usb_phy:
-       usb_put_transceiver(di->usb_phy);
+       usb_put_phy(di->usb_phy);
 free_usb:
        power_supply_unregister(&di->usb_chg.psy);
 free_ac: