diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2017-01-28 15:15:42 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-29 19:24:12 -0500 |
| commit | 40be0dda0725886b623d67868db3219a2e74683b (patch) | |
| tree | 20e4ab47bba12adbd70701e9d002ccb2599dae64 /net/ethernet | |
| parent | 936f459bea07868723b057ece43d321446c82f0a (diff) | |
| download | linux-riscv-40be0dda0725886b623d67868db3219a2e74683b.tar.gz linux-riscv-40be0dda0725886b623d67868db3219a2e74683b.tar.bz2 linux-riscv-40be0dda0725886b623d67868db3219a2e74683b.zip | |
net: add devm version of alloc_etherdev_mqs function
This patch adds devm_alloc_etherdev_mqs function and devm_alloc_etherdev
macro. These can be used for simpler netdev allocation without having to
care about calling free_netdev.
Thanks to this change drivers, their error paths and removal paths may
get simpler by a bit.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ethernet')
| -rw-r--r-- | net/ethernet/eth.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 8c5a479681ca..efdaaab735fc 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -392,6 +392,34 @@ struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs, } EXPORT_SYMBOL(alloc_etherdev_mqs); +static void devm_free_netdev(struct device *dev, void *res) +{ + free_netdev(*(struct net_device **)res); +} + +struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv, + unsigned int txqs, unsigned int rxqs) +{ + struct net_device **dr; + struct net_device *netdev; + + dr = devres_alloc(devm_free_netdev, sizeof(*dr), GFP_KERNEL); + if (!dr) + return NULL; + + netdev = alloc_etherdev_mqs(sizeof_priv, txqs, rxqs); + if (!netdev) { + devres_free(dr); + return NULL; + } + + *dr = netdev; + devres_add(dev, dr); + + return netdev; +} +EXPORT_SYMBOL(devm_alloc_etherdev_mqs); + ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len) { return scnprintf(buf, PAGE_SIZE, "%*phC\n", len, addr); |