korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-12 13:34:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: ks8851: Use devm_alloc_etherdev()

Browse Source 
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>
This commit is contained in:
Marek Vasut 2020-05-29 00:21:32 +02:00 committed by David S. Miller
parent 848fc0ce6c
commit b6948e1b7b
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ethernet/micrel/ks8851.c
View File

@ -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;
}