phy: qcom-usb-hs: Replace the extcon API

[linux-2.6-microblaze.git] / drivers / phy / qualcomm / phy-qcom-usb-hs.c

diff --git a/drivers/phy/qualcomm/phy-qcom-usb-hs.c b/drivers/phy/qualcomm/phy-qcom-usb-hs.c
index 4b20abc..2d0c70b 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-usb-hs.c
+++ b/drivers/phy/qualcomm/phy-qcom-usb-hs.c
@@ -155,12 +155,12 @@ static int qcom_usb_hs_phy_power_on(struct phy *phy)
        }
 
        if (uphy->vbus_edev) {
-               state = extcon_get_cable_state_(uphy->vbus_edev, EXTCON_USB);
+               state = extcon_get_state(uphy->vbus_edev, EXTCON_USB);
                /* setup initial state */
                qcom_usb_hs_phy_vbus_notifier(&uphy->vbus_notify, state,
                                              uphy->vbus_edev);
-               ret = extcon_register_notifier(uphy->vbus_edev, EXTCON_USB,
-                               &uphy->vbus_notify);
+               ret = devm_extcon_register_notifier(&ulpi->dev, uphy->vbus_edev,
+                               EXTCON_USB, &uphy->vbus_notify);
                if (ret)
                        goto err_ulpi;
        }
@@ -179,16 +179,8 @@ err_sleep:
 
 static int qcom_usb_hs_phy_power_off(struct phy *phy)
 {
-       int ret;
        struct qcom_usb_hs_phy *uphy = phy_get_drvdata(phy);
 
-       if (uphy->vbus_edev) {
-               ret = extcon_unregister_notifier(uphy->vbus_edev, EXTCON_USB,
-                                                &uphy->vbus_notify);
-               if (ret)
-                       return ret;
-       }
-
        regulator_disable(uphy->v3p3);
        regulator_disable(uphy->v1p8);
        clk_disable_unprepare(uphy->sleep_clk);