RDMA: Add and use rdma_for_each_port

We have many loops iterating over all of the end port numbers on a struct
ib_device, simplify them with a for_each helper.

Reviewed-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index ee4cca80f00b..48eda16db1a7 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -2495,7 +2495,7 @@ static void ipoib_add_one(struct ib_device *device)
         struct list_head *dev_list;
         struct net_device *dev;
         struct ipoib_dev_priv *priv;
-        int p;
+        unsigned int p;
         int count = 0;
 
         dev_list = kmalloc(sizeof(*dev_list), GFP_KERNEL);
@@ -2504,7 +2504,7 @@ static void ipoib_add_one(struct ib_device *device)
 
         INIT_LIST_HEAD(dev_list);
 
-        for (p = rdma_start_port(device); p <= rdma_end_port(device); ++p) {
+        rdma_for_each_port (device, p) {
                 if (!rdma_protocol_ib(device, p))
                         continue;
                 dev = ipoib_add_port("ib%d", device, p);
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 84184910f038..151f4eba84b8 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -4127,7 +4127,8 @@ static void srp_add_one(struct ib_device *device)
         struct srp_device *srp_dev;
         struct ib_device_attr *attr = &device->attrs;
         struct srp_host *host;
-        int mr_page_shift, p;
+        int mr_page_shift;
+        unsigned int p;
         u64 max_pages_per_mr;
         unsigned int flags = 0;
 
@@ -4194,7 +4195,7 @@ static void srp_add_one(struct ib_device *device)
                 WARN_ON_ONCE(srp_dev->global_rkey == 0);
         }
 
-        for (p = rdma_start_port(device); p <= rdma_end_port(device); ++p) {
+        rdma_for_each_port (device, p) {
                 host = srp_add_port(srp_dev, p);
                 if (host)
                         list_add_tail(&host->list, &srp_dev->dev_list);