usb: phy: qcom: Switch to new extcon framework API

[un]register_interest and reading cable state by
name have been deprecated. Switch to new API.

Signed-off-by: Ivan T. Ivanov <ivan.ivanov@linaro.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/phy/phy-qcom-8x16-usb.c b/drivers/usb/phy/phy-qcom-8x16-usb.c
index 5d357a9..579587d 100644 (file)
--- a/drivers/usb/phy/phy-qcom-8x16-usb.c
+++ b/drivers/usb/phy/phy-qcom-8x16-usb.c
@@ -71,7 +71,7 @@ struct phy_8x16 {
 
        struct reset_control            *phy_reset;
 
-       struct extcon_specific_cable_nb vbus_cable;
+       struct extcon_dev               *vbus_edev;
        struct notifier_block           vbus_notify;
 
        struct gpio_desc                *switch_gpio;
@@ -234,7 +234,7 @@ static int phy_8x16_init(struct usb_phy *phy)
        val = ULPI_PWR_OTG_COMP_DISABLE;
        usb_phy_io_write(phy, val, ULPI_SET(ULPI_PWR_CLK_MNG_REG));
 
-       state = extcon_get_cable_state(qphy->vbus_cable.edev, "USB");
+       state = extcon_get_cable_state_(qphy->vbus_edev, EXTCON_USB);
        if (state)
                phy_8x16_vbus_on(qphy);
        else
@@ -314,7 +314,6 @@ static int phy_8x16_reboot_notify(struct notifier_block *this,
 
 static int phy_8x16_probe(struct platform_device *pdev)
 {
-       struct extcon_dev *edev;
        struct phy_8x16 *qphy;
        struct resource *res;
        struct usb_phy *phy;
@@ -349,9 +348,9 @@ static int phy_8x16_probe(struct platform_device *pdev)
        if (ret < 0)
                return ret;
 
-       edev = extcon_get_edev_by_phandle(phy->dev, 0);
-       if (IS_ERR(edev))
-               return PTR_ERR(edev);
+       qphy->vbus_edev = extcon_get_edev_by_phandle(phy->dev, 0);
+       if (IS_ERR(qphy->vbus_edev))
+               return PTR_ERR(qphy->vbus_edev);
 
        ret = clk_set_rate(qphy->core_clk, INT_MAX);
        if (ret < 0)
@@ -370,8 +369,8 @@ static int phy_8x16_probe(struct platform_device *pdev)
                goto off_clks;
 
        qphy->vbus_notify.notifier_call = phy_8x16_vbus_notify;
-       ret = extcon_register_interest(&qphy->vbus_cable, edev->name,
-                                      "USB", &qphy->vbus_notify);
+       ret = extcon_register_notifier(qphy->vbus_edev, EXTCON_USB,
+                                      &qphy->vbus_notify);
        if (ret < 0)
                goto off_power;
 
@@ -385,7 +384,8 @@ static int phy_8x16_probe(struct platform_device *pdev)
        return 0;
 
 off_extcon:
-       extcon_unregister_interest(&qphy->vbus_cable);
+       extcon_unregister_notifier(qphy->vbus_edev, EXTCON_USB,
+                                  &qphy->vbus_notify);
 off_power:
        phy_8x16_regulators_disable(qphy);
 off_clks:
@@ -400,7 +400,8 @@ static int phy_8x16_remove(struct platform_device *pdev)
        struct phy_8x16 *qphy = platform_get_drvdata(pdev);
 
        unregister_reboot_notifier(&qphy->reboot_notify);
-       extcon_unregister_interest(&qphy->vbus_cable);
+       extcon_unregister_notifier(qphy->vbus_edev, EXTCON_USB,
+                                  &qphy->vbus_notify);
 
        /*
         * Ensure that D+/D- lines are routed to uB connector, so