Hi, On Friday 25 September 2015 06:17 AM, Axel Lin wrote: > Both data->id_det_gpio and data->vbus_det_gpio are optional, so use > devm_gpiod_get_optional for them. > > Signed-off-by: Axel Lin <[email protected]> > Reviewed-by: Hans de Goede <[email protected]>
merged this to linux-phy tree. Thanks Kishon > --- > This patch was sent on https://lkml.org/lkml/2015/8/21/177 > > drivers/phy/phy-sun4i-usb.c | 22 +++++++++------------- > 1 file changed, 9 insertions(+), 13 deletions(-) > > diff --git a/drivers/phy/phy-sun4i-usb.c b/drivers/phy/phy-sun4i-usb.c > index 731b395..b12964b 100644 > --- a/drivers/phy/phy-sun4i-usb.c > +++ b/drivers/phy/phy-sun4i-usb.c > @@ -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, > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
