IB/hfi1: Fix code consistency for if/else blocks in chip.c

Code structure is not consistent for if/else blocks and break
instructions in set_link_state for case HLS_UP_INIT. Physical
state uses break in case of an error and if/else blocks for
logical use cases. These blocks should be implemented consistently.

Reviewed-by: Jakub Byczkowski <jakub.byczkowski@intel.com>
Signed-off-by: Jan Sokolowski <jan.sokolowski@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index a62ef4acdca4044887bc5b6fe111fbca4360e85c..789dbc40ebd0d0a16d1bafc6ddd34231df86229e 100644 (file)
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -10569,18 +10569,19 @@ int set_link_state(struct hfi1_pportdata *ppd, u32 state)
                        dd_dev_err(dd,
                                   "%s: logical state did not change to INIT\n",
                                   __func__);
-               } else {
-                       /* clear old transient LINKINIT_REASON code */
-                       if (ppd->linkinit_reason >= OPA_LINKINIT_REASON_CLEAR)
-                               ppd->linkinit_reason =
-                                       OPA_LINKINIT_REASON_LINKUP;
+                       break;
+               }
 
-                       /* enable the port */
-                       add_rcvctrl(dd, RCV_CTRL_RCV_PORT_ENABLE_SMASK);
+               /* clear old transient LINKINIT_REASON code */
+               if (ppd->linkinit_reason >= OPA_LINKINIT_REASON_CLEAR)
+                       ppd->linkinit_reason =
+                               OPA_LINKINIT_REASON_LINKUP;
 
-                       handle_linkup_change(dd, 1);
-                       ppd->host_link_state = HLS_UP_INIT;
-               }
+               /* enable the port */
+               add_rcvctrl(dd, RCV_CTRL_RCV_PORT_ENABLE_SMASK);
+
+               handle_linkup_change(dd, 1);
+               ppd->host_link_state = HLS_UP_INIT;
                break;
        case HLS_UP_ARMED:
                if (ppd->host_link_state != HLS_UP_INIT)