Merge tag 'mailbox-v5.12' of git://git.linaro.org/landing-teams/working/fujitsu/integ...

[linux-2.6-microblaze.git] / net / devres.c

diff --git a/net/devres.c b/net/devres.c
index 57a6a88..1f9be21 100644 (file)
--- a/net/devres.c
+++ b/net/devres.c
@@ -39,7 +39,7 @@ struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv,
 }
 EXPORT_SYMBOL(devm_alloc_etherdev_mqs);
 
-static void devm_netdev_release(struct device *dev, void *this)
+static void devm_unregister_netdev(struct device *dev, void *this)
 {
        struct net_device_devres *res = this;
 
@@ -77,7 +77,7 @@ int devm_register_netdev(struct device *dev, struct net_device *ndev)
                                 netdev_devres_match, ndev)))
                return -EINVAL;
 
-       dr = devres_alloc(devm_netdev_release, sizeof(*dr), GFP_KERNEL);
+       dr = devres_alloc(devm_unregister_netdev, sizeof(*dr), GFP_KERNEL);
        if (!dr)
                return -ENOMEM;