Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0b5c2c9 authored by Chanwoo Choi's avatar Chanwoo Choi Committed by Chanwoo Choi
Browse files

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



This patch uses the resource-managed extcon API for extcon_register_notifier()
and replaces the deprecated extcon API as following:
- (deprecated) extcon_get_cable_state_() -> extcon_get_state()

Acked-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 5771a8c0

drivers/phy/qualcomm/phy-qcom-usb-hs.c

+3 −11
Original line number Original line Diff line number Diff line
@@ -155,12 +155,12 @@ static int qcom_usb_hs_phy_power_on(struct phy *phy) 
	}

	}





	if (uphy->vbus_edev) {

	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 */

		/* setup initial state */

		qcom_usb_hs_phy_vbus_notifier(&uphy->vbus_notify, state,

		qcom_usb_hs_phy_vbus_notifier(&uphy->vbus_notify, state,

					      uphy->vbus_edev);

					      uphy->vbus_edev);

		ret = extcon_register_notifier(uphy->vbus_edev, EXTCON_USB,

		ret = devm_extcon_register_notifier(&ulpi->dev, uphy->vbus_edev,

				&uphy->vbus_notify);

				EXTCON_USB, &uphy->vbus_notify);

		if (ret)

		if (ret)

			goto err_ulpi;

			goto err_ulpi;

	}

	}
@@ -179,16 +179,8 @@ static int qcom_usb_hs_phy_power_on(struct phy *phy) 




static int qcom_usb_hs_phy_power_off(struct phy *phy)

static int qcom_usb_hs_phy_power_off(struct phy *phy)

{

{

	int ret;

	struct qcom_usb_hs_phy *uphy = phy_get_drvdata(phy);

	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->v3p3);

	regulator_disable(uphy->v1p8);

	regulator_disable(uphy->v1p8);

	clk_disable_unprepare(uphy->sleep_clk);

	clk_disable_unprepare(uphy->sleep_clk);