net: ks8851: Use devm_alloc_etherdev()

Use device managed version of alloc_etherdev() to simplify the code.
No functional change intended.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Petr Stetiar <ynezz@true.cz>
Cc: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 582092a..86bfe55 100644 (file)
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -1421,7 +1421,7 @@ static int ks8851_probe(struct spi_device *spi)
        unsigned cider;
        int gpio;
 
-       netdev = alloc_etherdev(sizeof(struct ks8851_net));
+       netdev = devm_alloc_etherdev(dev, sizeof(struct ks8851_net));
        if (!netdev)
                return -ENOMEM;
 
@@ -1434,10 +1434,8 @@ static int ks8851_probe(struct spi_device *spi)
        ks->tx_space = 6144;
 
        gpio = of_get_named_gpio_flags(dev->of_node, "reset-gpios", 0, NULL);
-       if (gpio == -EPROBE_DEFER) {
-               ret = gpio;
-               goto err_gpio;
-       }
+       if (gpio == -EPROBE_DEFER)
+               return gpio;
 
        ks->gpio = gpio;
        if (gpio_is_valid(gpio)) {
@@ -1445,7 +1443,7 @@ static int ks8851_probe(struct spi_device *spi)
                                            GPIOF_OUT_INIT_LOW, "ks8851_rst_n");
                if (ret) {
                        dev_err(dev, "reset gpio request failed\n");
-                       goto err_gpio;
+                       return ret;
                }
        }
 
@@ -1564,8 +1562,6 @@ err_id:
 err_reg:
        regulator_disable(ks->vdd_io);
 err_reg_io:
-err_gpio:
-       free_netdev(netdev);
        return ret;
 }
 
@@ -1582,7 +1578,6 @@ static int ks8851_remove(struct spi_device *spi)
                gpio_set_value(priv->gpio, 0);
        regulator_disable(priv->vdd_reg);
        regulator_disable(priv->vdd_io);
-       free_netdev(priv->netdev);
 
        return 0;
 }