Commit 3d772c4a authored by Hans de Goede's avatar Hans de Goede Committed by Kishon Vijay Abraham I
Browse files

phy-sun4i-sub: Move vbus-detect helper functions up in the file 



Move vbus-detect helper functions up in the file, just moving some code
around, no functional changes what so ever.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent 219bf159

drivers/phy/phy-sun4i-usb.c

+24 −24
Original line number Diff line number Diff line
@@ -294,6 +294,30 @@ static int sun4i_usb_phy_exit(struct phy *_phy) 
	return 0;

}



static int sun4i_usb_phy0_get_vbus_det(struct sun4i_usb_phy_data *data)

{

	if (data->vbus_det_gpio)

		return gpiod_get_value_cansleep(data->vbus_det_gpio);



	if (data->vbus_power_supply) {

		union power_supply_propval val;

		int r;



		r = power_supply_get_property(data->vbus_power_supply,

					      POWER_SUPPLY_PROP_PRESENT, &val);

		if (r == 0)

			return val.intval;

	}



	/* Fallback: report vbus as high */

	return 1;

}



static bool sun4i_usb_phy0_have_vbus_det(struct sun4i_usb_phy_data *data)

{

	return data->vbus_det_gpio || data->vbus_power_supply;

}



static int sun4i_usb_phy_power_on(struct phy *_phy)

{

	struct sun4i_usb_phy *phy = phy_get_drvdata(_phy);
@@ -356,30 +380,6 @@ static struct phy_ops sun4i_usb_phy_ops = { 
	.owner		= THIS_MODULE,

};



static int sun4i_usb_phy0_get_vbus_det(struct sun4i_usb_phy_data *data)

{

	if (data->vbus_det_gpio)

		return gpiod_get_value_cansleep(data->vbus_det_gpio);



	if (data->vbus_power_supply) {

		union power_supply_propval val;

		int r;



		r = power_supply_get_property(data->vbus_power_supply,

					      POWER_SUPPLY_PROP_PRESENT, &val);

		if (r == 0)

			return val.intval;

	}



	/* Fallback: report vbus as high */

	return 1;

}



static bool sun4i_usb_phy0_have_vbus_det(struct sun4i_usb_phy_data *data)

{

	return data->vbus_det_gpio || data->vbus_power_supply;

}



static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)

{

	struct sun4i_usb_phy_data *data =