1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index 0fae85062a65..ca919f429666 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -1156,12 +1156,8 @@ static void ib_sa_add_one(struct ib_device *device)
         int s, e, i;
         int count = 0;
 
-        if (device->node_type == RDMA_NODE_IB_SWITCH)
-                s = e = 0;
-        else {
-                s = 1;
-                e = device->phys_port_cnt;
-        }
+        s = rdma_start_port(device);
+        e = rdma_end_port(device);
 
         sa_dev = kzalloc(sizeof *sa_dev +
                          (e - s + 1) * sizeof (struct ib_sa_port),