Skip to content

Commit 25a1cd3

Browse files
paravmellanoxdledford
authored andcommitted
IB/core: Make gid_table_reserve_default() return void
gid_table_reserve_default() always returns zero. Make it return void and simplify error checking. rdma_port is already calculated, use that while calling gid_table_reserve_default() instead of recalculating it. Reviewed-by: Daniel Jurgens <[email protected]> Signed-off-by: Parav Pandit <[email protected]> Signed-off-by: Leon Romanovsky <[email protected]> Reviewed-by: Dennis Dalessandro <[email protected]> Signed-off-by: Doug Ledford <[email protected]>
1 parent 056f9c7 commit 25a1cd3

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

drivers/infiniband/core/cache.c

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -757,8 +757,8 @@ void ib_cache_gid_set_default_gid(struct ib_device *ib_dev, u8 port,
757757
}
758758
}
759759

760-
static int gid_table_reserve_default(struct ib_device *ib_dev, u8 port,
761-
struct ib_gid_table *table)
760+
static void gid_table_reserve_default(struct ib_device *ib_dev, u8 port,
761+
struct ib_gid_table *table)
762762
{
763763
unsigned int i;
764764
unsigned long roce_gid_type_mask;
@@ -768,17 +768,14 @@ static int gid_table_reserve_default(struct ib_device *ib_dev, u8 port,
768768
roce_gid_type_mask = roce_gid_type_mask_support(ib_dev, port);
769769
num_default_gids = hweight_long(roce_gid_type_mask);
770770
for (i = 0; i < num_default_gids && i < table->sz; i++) {
771-
struct ib_gid_table_entry *entry =
772-
&table->data_vec[i];
771+
struct ib_gid_table_entry *entry = &table->data_vec[i];
773772

774773
entry->props |= GID_TABLE_ENTRY_DEFAULT;
775774
current_gid = find_next_bit(&roce_gid_type_mask,
776775
BITS_PER_LONG,
777776
current_gid);
778777
entry->attr.gid_type = current_gid++;
779778
}
780-
781-
return 0;
782779
}
783780

784781
static int _gid_table_setup_one(struct ib_device *ib_dev)
@@ -790,19 +787,14 @@ static int _gid_table_setup_one(struct ib_device *ib_dev)
790787
for (port = 0; port < ib_dev->phys_port_cnt; port++) {
791788
u8 rdma_port = port + rdma_start_port(ib_dev);
792789

793-
table =
794-
alloc_gid_table(
790+
table = alloc_gid_table(
795791
ib_dev->port_immutable[rdma_port].gid_tbl_len);
796792
if (!table) {
797793
err = -ENOMEM;
798794
goto rollback_table_setup;
799795
}
800796

801-
err = gid_table_reserve_default(ib_dev,
802-
port + rdma_start_port(ib_dev),
803-
table);
804-
if (err)
805-
goto rollback_table_setup;
797+
gid_table_reserve_default(ib_dev, rdma_port, table);
806798
ib_dev->cache.ports[port].gid = table;
807799
}
808800

0 commit comments

Comments
 (0)