diff options
| author | Chanwoo Choi <cw00.choi@samsung.com> | 2017-08-16 09:22:55 +0900 |
|---|---|---|
| committer | Chanwoo Choi <cw00.choi@samsung.com> | 2017-08-16 09:22:55 +0900 |
| commit | ae3614fda98c5dc2e34ed3145f933e11a339916a (patch) | |
| tree | 8e22b980bdba1ea22659c4b759bd3229e3b3f4e4 /drivers/phy/qualcomm/phy-qcom-usb-hs.c | |
| parent | 1cf76c4eeb07ba31a03066c6540d96fd64d7a34f (diff) | |
| parent | 808ae8f3c7fefef3aece08820c108b68cdb06e1e (diff) | |
| download | linux-ae3614fda98c5dc2e34ed3145f933e11a339916a.tar.gz linux-ae3614fda98c5dc2e34ed3145f933e11a339916a.tar.xz | |
Merge branch 'ib-extcon-usb-phy-4.14' into extcon-next
Diffstat (limited to 'drivers/phy/qualcomm/phy-qcom-usb-hs.c')
| -rw-r--r-- | drivers/phy/qualcomm/phy-qcom-usb-hs.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/phy/qualcomm/phy-qcom-usb-hs.c b/drivers/phy/qualcomm/phy-qcom-usb-hs.c index 4b20abc3ae2f..2d0c70b5589f 100644 --- 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); |