Merge tag 'v4.3-rc2' into k.o/for-4.3-v1

[karo-tx-linux.git] / drivers / infiniband / core / device.c

diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 7a4ee795c13e0f01dabb25f1b43b475b129c96e3..17639117afc6ab8637c7e73a3e2a13e6101a9702 100644 (file)
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -324,6 +324,7 @@ int ib_register_device(struct ib_device *device,
                                            u8, struct kobject *))
 {
        int ret;
+       struct ib_client *client;
 
        mutex_lock(&device_mutex);
 
@@ -361,13 +362,9 @@ int ib_register_device(struct ib_device *device,
 
        device->reg_state = IB_DEV_REGISTERED;
 
-       {
-               struct ib_client *client;
-
-               list_for_each_entry(client, &client_list, list)
-                       if (client->add && !add_client_context(device, client))
-                               client->add(device);
-       }
+       list_for_each_entry(client, &client_list, list)
+               if (client->add && !add_client_context(device, client))
+                       client->add(device);
 
        down_write(&lists_rwsem);
        list_add_tail(&device->core_list, &device_list);