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

Commit b2dfc34c authored by Axel Lin's avatar Axel Lin Committed by Kishon Vijay Abraham I
Browse files

phy: sun4i-usb: Use devm_gpiod_get_optional for optional GPIOs 



Both data->id_det_gpio and data->vbus_det_gpio are optional, so use
devm_gpiod_get_optional for them.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent dc7f190f

drivers/phy/phy-sun4i-usb.c

+9 −13
Original line number Diff line number Diff line
@@ -551,19 +551,15 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev) 
	if (IS_ERR(data->base))

		return PTR_ERR(data->base);



	data->id_det_gpio = devm_gpiod_get(dev, "usb0_id_det", GPIOD_IN);

	if (IS_ERR(data->id_det_gpio)) {

		if (PTR_ERR(data->id_det_gpio) == -EPROBE_DEFER)

			return -EPROBE_DEFER;

		data->id_det_gpio = NULL;

	}



	data->vbus_det_gpio = devm_gpiod_get(dev, "usb0_vbus_det", GPIOD_IN);

	if (IS_ERR(data->vbus_det_gpio)) {

		if (PTR_ERR(data->vbus_det_gpio) == -EPROBE_DEFER)

			return -EPROBE_DEFER;

		data->vbus_det_gpio = NULL;

	}

	data->id_det_gpio = devm_gpiod_get_optional(dev, "usb0_id_det",

						    GPIOD_IN);

	if (IS_ERR(data->id_det_gpio))

		return PTR_ERR(data->id_det_gpio);



	data->vbus_det_gpio = devm_gpiod_get_optional(dev, "usb0_vbus_det",

						      GPIOD_IN);

	if (IS_ERR(data->vbus_det_gpio))

		return PTR_ERR(data->vbus_det_gpio);



	if (of_find_property(np, "usb0_vbus_power-supply", NULL)) {

		data->vbus_power_supply = devm_power_supply_get_by_phandle(dev,