Move reset_control_deassert after devm_reset_controller_register() to simplify the error path in probe(). While at it, drop the blank line before devm_reset_controller_register(). Signed-off-by: Biju Das <biju.das.jz@xxxxxxxxxxxxxx> --- drivers/reset/reset-rzg2l-usbphy-ctrl.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/reset/reset-rzg2l-usbphy-ctrl.c b/drivers/reset/reset-rzg2l-usbphy-ctrl.c index 8f6fbd978591..93c65a57686d 100644 --- a/drivers/reset/reset-rzg2l-usbphy-ctrl.c +++ b/drivers/reset/reset-rzg2l-usbphy-ctrl.c @@ -121,20 +121,19 @@ static int rzg2l_usbphy_ctrl_probe(struct platform_device *pdev) return dev_err_probe(dev, PTR_ERR(priv->rstc), "failed to get reset\n"); - error = reset_control_deassert(priv->rstc); - if (error) - return error; - priv->rcdev.ops = &rzg2l_usbphy_ctrl_reset_ops; priv->rcdev.of_reset_n_cells = 1; priv->rcdev.nr_resets = NUM_PORTS; priv->rcdev.of_node = dev->of_node; priv->rcdev.dev = dev; - error = devm_reset_controller_register(dev, &priv->rcdev); if (error) return error; + error = reset_control_deassert(priv->rstc); + if (error) + return error; + spin_lock_init(&priv->lock); dev_set_drvdata(dev, priv); -- 2.25.1
