Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / net / core / net-sysfs.c

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index f8f94303a1f57203eaa28b5ea459ac28c89e1b12..e4fd68389d6f39adb34e383617d5f06c11a84ab1 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -754,9 +754,9 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue,
        rcu_assign_pointer(queue->rps_map, map);
 
        if (map)
-               static_key_slow_inc(&rps_needed);
+               static_branch_inc(&rps_needed);
        if (old_map)
-               static_key_slow_dec(&rps_needed);
+               static_branch_dec(&rps_needed);
 
        mutex_unlock(&rps_map_mutex);
 
@@ -1747,20 +1747,16 @@ int netdev_register_kobject(struct net_device *ndev)
 
        error = device_add(dev);
        if (error)
-               goto error_put_device;
+               return error;
 
        error = register_queue_kobjects(ndev);
-       if (error)
-               goto error_device_del;
+       if (error) {
+               device_del(dev);
+               return error;
+       }
 
        pm_runtime_set_memalloc_noio(dev, true);
 
-       return 0;
-
-error_device_del:
-       device_del(dev);
-error_put_device:
-       put_device(dev);
        return error;
 }