IB/hfi1: Move constant to the right in bitwise operations

Implement changes recommended by the Coccinelle tool to move constant to
the right in bitwise operations

-bash-4.2$ make coccicheck MODE=report M=drivers/infiniband/hw/hfi1/

drivers/infiniband/hw/hfi1/pio.c:765:4-16: Move constant to right.
drivers/infiniband/hw/hfi1/rc.c:2503:19-29: Move constant to right.
drivers/infiniband/hw/hfi1/chip.c:9813:11-22: Move constant to right.
drivers/infiniband/hw/hfi1/chip.c:14468:29-40: Move constant to right.

Reviewed-by: Jubin John <jubin.john@intel.com>
Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Harish Chegondi <harish.chegondi@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
index 7799652773d566ce3c1e76ae2ce3ca0ba5112e41..263c8827451433f3c360dffe2f6688e0cd4acbbf 100644 (file)
--- a/drivers/staging/rdma/hfi1/chip.c
+++ b/drivers/staging/rdma/hfi1/chip.c
@@ -9810,7 +9810,7 @@ static int goto_offline(struct hfi1_pportdata *ppd, u8 rem_reason)
 
        if (do_transition) {
                ret = set_physical_link_state(dd,
-                                             PLS_OFFLINE | (rem_reason << 8));
+                                             (rem_reason << 8) | PLS_OFFLINE);
 
                if (ret != HCMD_SUCCESS) {
                        dd_dev_err(dd,
@@ -14465,8 +14465,8 @@ static void handle_temp_err(struct hfi1_devdata *dd)
         */
        ppd->driver_link_ready = 0;
        ppd->link_enabled = 0;
-       set_physical_link_state(dd, PLS_OFFLINE |
-                               (OPA_LINKDOWN_REASON_SMA_DISABLED << 8));
+       set_physical_link_state(dd, (OPA_LINKDOWN_REASON_SMA_DISABLED << 8) |
+                               PLS_OFFLINE);
        /*
         * Step 2: Shutdown LCB and 8051
         *         After shutdown, do not restore DC_CFG_RESET value.

diff --git a/drivers/staging/rdma/hfi1/pio.c b/drivers/staging/rdma/hfi1/pio.c
index 361b43d47c76c5a8152f539dd99cf6052903fa72..e888e214356b4945a178e484c822e9f5e5622450 100644 (file)
--- a/drivers/staging/rdma/hfi1/pio.c
+++ b/drivers/staging/rdma/hfi1/pio.c
@@ -762,8 +762,8 @@ struct send_context *sc_alloc(struct hfi1_devdata *dd, int type,
 
        /* set the default partition key */
        write_kctxt_csr(dd, hw_context, SC(CHECK_PARTITION_KEY),
-                       (DEFAULT_PKEY &
-                        SC(CHECK_PARTITION_KEY_VALUE_MASK)) <<
+                       (SC(CHECK_PARTITION_KEY_VALUE_MASK) &
+                        DEFAULT_PKEY) <<
                        SC(CHECK_PARTITION_KEY_VALUE_SHIFT));
 
        /* per context type checks */

diff --git a/drivers/staging/rdma/hfi1/rc.c b/drivers/staging/rdma/hfi1/rc.c
index 1ce0e08378b4fcd3b5df9cfd053ad2b75a762da2..351f136c7caac1cd7a6610b55a4f425efe68e8e7 100644 (file)
--- a/drivers/staging/rdma/hfi1/rc.c
+++ b/drivers/staging/rdma/hfi1/rc.c
@@ -2500,7 +2500,7 @@ send_last:
        return;
 
 rnr_nak:
-       qp->r_nak_state = IB_RNR_NAK | qp->r_min_rnr_timer;
+       qp->r_nak_state = qp->r_min_rnr_timer | IB_RNR_NAK;
        qp->r_ack_psn = qp->r_psn;
        /* Queue RNR NAK for later */
        rc_defered_ack(rcd, qp);