Commit c78dbad8 authored by Stephen Boyd's avatar Stephen Boyd Committed by David S. Miller

net: ks8851: Use devm_regulator_get_optional()

This simplifies error paths and removes the need to
regulator_put().

Cc: Nishanth Menon <nm@ti.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 481300cc
...@@ -1417,7 +1417,7 @@ static int ks8851_probe(struct spi_device *spi) ...@@ -1417,7 +1417,7 @@ static int ks8851_probe(struct spi_device *spi)
ks->spidev = spi; ks->spidev = spi;
ks->tx_space = 6144; ks->tx_space = 6144;
ks->vdd_reg = regulator_get_optional(&spi->dev, "vdd"); ks->vdd_reg = devm_regulator_get_optional(&spi->dev, "vdd");
if (IS_ERR(ks->vdd_reg)) { if (IS_ERR(ks->vdd_reg)) {
ret = PTR_ERR(ks->vdd_reg); ret = PTR_ERR(ks->vdd_reg);
if (ret == -EPROBE_DEFER) if (ret == -EPROBE_DEFER)
...@@ -1427,7 +1427,7 @@ static int ks8851_probe(struct spi_device *spi) ...@@ -1427,7 +1427,7 @@ static int ks8851_probe(struct spi_device *spi)
if (ret) { if (ret) {
dev_err(&spi->dev, "regulator enable fail: %d\n", dev_err(&spi->dev, "regulator enable fail: %d\n",
ret); ret);
goto err_reg_en; goto err_reg;
} }
} }
...@@ -1530,9 +1530,6 @@ static int ks8851_probe(struct spi_device *spi) ...@@ -1530,9 +1530,6 @@ static int ks8851_probe(struct spi_device *spi)
err_id: err_id:
if (!IS_ERR(ks->vdd_reg)) if (!IS_ERR(ks->vdd_reg))
regulator_disable(ks->vdd_reg); regulator_disable(ks->vdd_reg);
err_reg_en:
if (!IS_ERR(ks->vdd_reg))
regulator_put(ks->vdd_reg);
err_reg: err_reg:
free_netdev(ndev); free_netdev(ndev);
return ret; return ret;
...@@ -1547,10 +1544,8 @@ static int ks8851_remove(struct spi_device *spi) ...@@ -1547,10 +1544,8 @@ static int ks8851_remove(struct spi_device *spi)
unregister_netdev(priv->netdev); unregister_netdev(priv->netdev);
free_irq(spi->irq, priv); free_irq(spi->irq, priv);
if (!IS_ERR(priv->vdd_reg)) { if (!IS_ERR(priv->vdd_reg))
regulator_disable(priv->vdd_reg); regulator_disable(priv->vdd_reg);
regulator_put(priv->vdd_reg);
}
free_netdev(priv->netdev); free_netdev(priv->netdev);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment