diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/micrel/ks8851.c | 50 |
1 files changed, 22 insertions, 28 deletions
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c index e729189..66d4ab7 100644 --- a/drivers/net/ethernet/micrel/ks8851.c +++ b/drivers/net/ethernet/micrel/ks8851.c @@ -1441,32 +1441,30 @@ static int ks8851_probe(struct spi_device *spi) } } - ks->vdd_io = devm_regulator_get_optional(&spi->dev, "vdd-io"); + ks->vdd_io = devm_regulator_get(&spi->dev, "vdd-io"); if (IS_ERR(ks->vdd_io)) { ret = PTR_ERR(ks->vdd_io); - if (ret == -EPROBE_DEFER) - goto err_reg_io; - } else { - ret = regulator_enable(ks->vdd_io); - if (ret) { - dev_err(&spi->dev, "regulator vdd_io enable fail: %d\n", - ret); - goto err_reg_io; - } + goto err_reg_io; + } + + ret = regulator_enable(ks->vdd_io); + if (ret) { + dev_err(&spi->dev, "regulator vdd_io enable fail: %d\n", + ret); + goto err_reg_io; } - ks->vdd_reg = devm_regulator_get_optional(&spi->dev, "vdd"); + ks->vdd_reg = devm_regulator_get(&spi->dev, "vdd"); if (IS_ERR(ks->vdd_reg)) { ret = PTR_ERR(ks->vdd_reg); - if (ret == -EPROBE_DEFER) - goto err_reg; - } else { - ret = regulator_enable(ks->vdd_reg); - if (ret) { - dev_err(&spi->dev, "regulator vdd enable fail: %d\n", - ret); - goto err_reg; - } + goto err_reg; + } + + ret = regulator_enable(ks->vdd_reg); + if (ret) { + dev_err(&spi->dev, "regulator vdd enable fail: %d\n", + ret); + goto err_reg; } if (gpio_is_valid(gpio)) { @@ -1572,11 +1570,9 @@ err_irq: if (gpio_is_valid(gpio)) gpio_set_value(gpio, 0); err_id: - if (!IS_ERR(ks->vdd_reg)) - regulator_disable(ks->vdd_reg); + regulator_disable(ks->vdd_reg); err_reg: - if (!IS_ERR(ks->vdd_io)) - regulator_disable(ks->vdd_io); + regulator_disable(ks->vdd_io); err_reg_io: err_gpio: free_netdev(ndev); @@ -1594,10 +1590,8 @@ static int ks8851_remove(struct spi_device *spi) free_irq(spi->irq, priv); if (gpio_is_valid(priv->gpio)) gpio_set_value(priv->gpio, 0); - if (!IS_ERR(priv->vdd_reg)) - regulator_disable(priv->vdd_reg); - if (!IS_ERR(priv->vdd_io)) - regulator_disable(priv->vdd_io); + regulator_disable(priv->vdd_reg); + regulator_disable(priv->vdd_io); free_netdev(priv->netdev); return 0; |