Commit e0f681c2 authored by Fabrice Gasnier's avatar Fabrice Gasnier Committed by Felipe Balbi
Browse files

usb: dwc2: get optional vbus-supply regulator once 



Move devm_regulator_get_optional() call to probe routine. This avoids
'vbus-supply' regulator to be requested lots of times, upon each call
to dwc2_vbus_supply_init(), e.g. like with runtime pm.

Fixes: 531ef5eb ("usb: dwc2: add support for host mode external
vbus supply")

Tested-by: default avatarArtur Petrosyan <arturp@synopsys.com>
Acked-by: default avatarMinas Harutyunyan <hminas@synopsys.com>
Signed-off-by: default avatarFabrice Gasnier <fabrice.gasnier@st.com>
Signed-off-by: default avatarAmelie Delaunay <amelie.delaunay@st.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 3def4031

drivers/usb/dwc2/hcd.c

+3 −9
Original line number Diff line number Diff line
@@ -358,16 +358,10 @@ static void dwc2_gusbcfg_init(struct dwc2_hsotg *hsotg) 


static int dwc2_vbus_supply_init(struct dwc2_hsotg *hsotg)

{

	int ret;



	hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");

	if (IS_ERR(hsotg->vbus_supply)) {

		ret = PTR_ERR(hsotg->vbus_supply);

		hsotg->vbus_supply = NULL;

		return ret == -ENODEV ? 0 : ret;

	}



	if (hsotg->vbus_supply)

		return regulator_enable(hsotg->vbus_supply);



	return 0;

}



static int dwc2_vbus_supply_exit(struct dwc2_hsotg *hsotg)

drivers/usb/dwc2/platform.c

+8 −0
Original line number Diff line number Diff line
@@ -432,6 +432,14 @@ static int dwc2_driver_probe(struct platform_device *dev) 
	if (retval)

		return retval;



	hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");

	if (IS_ERR(hsotg->vbus_supply)) {

		retval = PTR_ERR(hsotg->vbus_supply);

		hsotg->vbus_supply = NULL;

		if (retval != -ENODEV)

			return retval;

	}



	retval = dwc2_lowlevel_hw_enable(hsotg);

	if (retval)

		return retval;