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>

diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 42add77ae47d7ef7f0203949f42a89338f05e97e..c62b709b1ce087b7891f5d9c76aa2940b7f4a9a9 100644 (file)
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -54,6 +54,11 @@ struct net_device *alloc_etherdev_mqs(int sizeof_priv, unsigned int txqs,
 #define alloc_etherdev(sizeof_priv) alloc_etherdev_mq(sizeof_priv, 1)
 #define alloc_etherdev_mq(sizeof_priv, count) alloc_etherdev_mqs(sizeof_priv, count, count)
 
+struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv,
+                                          unsigned int txqs,
+                                          unsigned int rxqs);
+#define devm_alloc_etherdev(dev, sizeof_priv) devm_alloc_etherdev_mqs(dev, sizeof_priv, 1, 1)
+
 struct sk_buff **eth_gro_receive(struct sk_buff **head,
                                 struct sk_buff *skb);
 int eth_gro_complete(struct sk_buff *skb, int nhoff);

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 8c5a479681ca9ed8c2686208fc570e819a4db31a..efdaaab735fced4a3ed2ab38620d6f4d4de1566e 100644 (file)
--- 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);