IB/core: Change roce_rescan_device to return void

It always returns 0. Change return type to void.

Signed-off-by: Daniel Jurgens <danielj@mellanox.com>
Reviewed-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index 7babdbceb6d0e882d82fb8e0d3f5cabac532e233..fc4022884dbbe292e14fd9d5401b994c34a0c7db 100644 (file)
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -821,12 +821,7 @@ static int gid_table_setup_one(struct ib_device *ib_dev)
        if (err)
                return err;
 
-       err = roce_rescan_device(ib_dev);
-
-       if (err) {
-               gid_table_cleanup_one(ib_dev);
-               gid_table_release_one(ib_dev);
-       }
+       roce_rescan_device(ib_dev);
 
        return err;
 }

diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h
index 0deff4c4911b2bb3965f53c7253c188c37b78f51..39e3c1d02613d9084c2c5e6cc06137eda07ce91f 100644 (file)
--- a/drivers/infiniband/core/core_priv.h
+++ b/drivers/infiniband/core/core_priv.h
@@ -137,7 +137,7 @@ int ib_cache_gid_del_all_netdev_gids(struct ib_device *ib_dev, u8 port,
 int roce_gid_mgmt_init(void);
 void roce_gid_mgmt_cleanup(void);
 
-int roce_rescan_device(struct ib_device *ib_dev);
+void roce_rescan_device(struct ib_device *ib_dev);
 unsigned long roce_gid_type_mask_support(struct ib_device *ib_dev, u8 port);
 
 int ib_cache_setup_one(struct ib_device *device);

diff --git a/drivers/infiniband/core/roce_gid_mgmt.c b/drivers/infiniband/core/roce_gid_mgmt.c
index 90e3889b7fbe8e608e2eb8ae15347834dbe0ce0e..ebfe45739ca7d8d3e988ca53c07d0a2dfcf95b03 100644 (file)
--- a/drivers/infiniband/core/roce_gid_mgmt.c
+++ b/drivers/infiniband/core/roce_gid_mgmt.c
@@ -412,12 +412,10 @@ static void enum_all_gids_of_dev_cb(struct ib_device *ib_dev,
 
 /* This function will rescan all of the network devices in the system
  * and add their gids, as needed, to the relevant RoCE devices. */
-int roce_rescan_device(struct ib_device *ib_dev)
+void roce_rescan_device(struct ib_device *ib_dev)
 {
        ib_enum_roce_netdev(ib_dev, pass_all_filter, NULL,
                            enum_all_gids_of_dev_cb, NULL);
-
-       return 0;
 }
 
 static void callback_for_addr_gid_device_scan(struct ib_device *device,