| Message ID | 20170315113149.30335-1-p.zabel@pengutronix.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Wednesday 15 March 2017 05:01 PM, Philipp Zabel wrote: > As of commit bb475230b8e5 ("reset: make optional functions really > optional"), the reset framework API calls use NULL pointers to describe > optional, non-present reset controls. > > This allows to return errors from devm_reset_control_get_optional_shared > and to call reset_control_reset unconditionally. > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > Tested-by: Jerome Brunet <jbrunet@baylibre.com> Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > drivers/phy/phy-meson8b-usb2.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/phy/phy-meson8b-usb2.c b/drivers/phy/phy-meson8b-usb2.c > index 33c9f4ba157d1..c5e856007ba0c 100644 > --- a/drivers/phy/phy-meson8b-usb2.c > +++ b/drivers/phy/phy-meson8b-usb2.c > @@ -141,12 +141,10 @@ static int phy_meson8b_usb2_power_on(struct phy *phy) > struct phy_meson8b_usb2_priv *priv = phy_get_drvdata(phy); > int ret; > > - if (!IS_ERR_OR_NULL(priv->reset)) { > - ret = reset_control_reset(priv->reset); > - if (ret) { > - dev_err(&phy->dev, "Failed to trigger USB reset\n"); > - return ret; > - } > + ret = reset_control_reset(priv->reset); > + if (ret) { > + dev_err(&phy->dev, "Failed to trigger USB reset\n"); > + return ret; > } > > ret = clk_prepare_enable(priv->clk_usb_general); > @@ -241,7 +239,7 @@ static int phy_meson8b_usb2_probe(struct platform_device *pdev) > return PTR_ERR(priv->clk_usb); > > priv->reset = devm_reset_control_get_optional_shared(&pdev->dev, NULL); > - if (PTR_ERR(priv->reset) == -EPROBE_DEFER) > + if (IS_ERR(priv->reset)) > return PTR_ERR(priv->reset); > > priv->dr_mode = of_usb_get_dr_mode_by_phy(pdev->dev.of_node, -1); >
diff --git a/drivers/phy/phy-meson8b-usb2.c b/drivers/phy/phy-meson8b-usb2.c index 33c9f4ba157d1..c5e856007ba0c 100644 --- a/drivers/phy/phy-meson8b-usb2.c +++ b/drivers/phy/phy-meson8b-usb2.c @@ -141,12 +141,10 @@ static int phy_meson8b_usb2_power_on(struct phy *phy) struct phy_meson8b_usb2_priv *priv = phy_get_drvdata(phy); int ret; - if (!IS_ERR_OR_NULL(priv->reset)) { - ret = reset_control_reset(priv->reset); - if (ret) { - dev_err(&phy->dev, "Failed to trigger USB reset\n"); - return ret; - } + ret = reset_control_reset(priv->reset); + if (ret) { + dev_err(&phy->dev, "Failed to trigger USB reset\n"); + return ret; } ret = clk_prepare_enable(priv->clk_usb_general); @@ -241,7 +239,7 @@ static int phy_meson8b_usb2_probe(struct platform_device *pdev) return PTR_ERR(priv->clk_usb); priv->reset = devm_reset_control_get_optional_shared(&pdev->dev, NULL); - if (PTR_ERR(priv->reset) == -EPROBE_DEFER) + if (IS_ERR(priv->reset)) return PTR_ERR(priv->reset); priv->dr_mode = of_usb_get_dr_mode_by_phy(pdev->dev.of_node, -1);
As of commit bb475230b8e5 ("reset: make optional functions really optional"), the reset framework API calls use NULL pointers to describe optional, non-present reset controls. This allows to return errors from devm_reset_control_get_optional_shared and to call reset_control_reset unconditionally. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Tested-by: Jerome Brunet <jbrunet@baylibre.com> --- drivers/phy/phy-meson8b-usb2.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)