RDMA/amso1100: use offset_in_page macro

Use offset_in_page macro instead of (addr & ~PAGE_MASK).

Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rdma/amso1100/c2_alloc.c b/drivers/staging/rdma/amso1100/c2_alloc.c
index 78d247ec69612ba287efde11f7583724e508408d..039872dfabbcaad233fc69c5e69608856e703072 100644 (file)
--- a/drivers/staging/rdma/amso1100/c2_alloc.c
+++ b/drivers/staging/rdma/amso1100/c2_alloc.c
@@ -131,7 +131,7 @@ void c2_free_mqsp(__be16 *mqsp)
        *mqsp = (__force __be16) head->head;
 
        /* Compute the shared_ptr index */
-       idx = ((unsigned long) mqsp & ~PAGE_MASK) >> 1;
+       idx = (offset_in_page(mqsp)) >> 1;
        idx -= (unsigned long) &(((struct sp_chunk *) 0)->shared_ptr[0]) >> 1;
 
        /* Point this index at the head */

diff --git a/drivers/staging/rdma/amso1100/c2_provider.c b/drivers/staging/rdma/amso1100/c2_provider.c
index 25c3f008556380eb87678a3129fe2051158cdf82..956d76b111b088ddf49056e7f0fe4fb0a98f1a63 100644 (file)
--- a/drivers/staging/rdma/amso1100/c2_provider.c
+++ b/drivers/staging/rdma/amso1100/c2_provider.c
@@ -359,7 +359,7 @@ static struct ib_mr *c2_reg_phys_mr(struct ib_pd *ib_pd,
 
        for (i = 0; i < num_phys_buf; i++) {
 
-               if (buffer_list[i].addr & ~PAGE_MASK) {
+               if (offset_in_page(buffer_list[i].addr)) {
                        pr_debug("Unaligned Memory Buffer: 0x%x\n",
                                (unsigned int) buffer_list[i].addr);
                        return ERR_PTR(-EINVAL);