IB/hfi1: Remove unused link_default variable

devdata->link_default is no longer variable

Maintain number of holes by moving dc_shutdown

Reviewed-by: Sebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@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 2cbc619a175445c1e204c2981a65a874530e590c..6b63201513fe9a4201886107c71fe9b3917af25c 100644 (file)
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -9956,7 +9956,7 @@ int hfi1_get_ib_cfg(struct hfi1_pportdata *ppd, int which)
                val = ppd->phy_error_threshold;
                break;
        case HFI1_IB_CFG_LINKDEFAULT: /* IB link default (sleep/poll) */
-               val = dd->link_default;
+               val = HLS_DEFAULT;
                break;
 
        case HFI1_IB_CFG_HRTBT: /* Heartbeat off/enable/auto */
@@ -10551,7 +10551,7 @@ int set_link_state(struct hfi1_pportdata *ppd, u32 state)
 
        orig_new_state = state;
        if (state == HLS_DN_DOWNDEF)
-               state = dd->link_default;
+               state = HLS_DEFAULT;
 
        /* interpret poll -> poll as a link bounce */
        poll_bounce = ppd->host_link_state == HLS_DN_POLL &&
@@ -14895,8 +14895,6 @@ struct hfi1_devdata *hfi1_init_dd(struct pci_dev *pdev,
                init_vl_arb_caches(ppd);
        }
 
-       dd->link_default = HLS_DN_POLL;
-
        /*
         * Do remaining PCIe setup and save PCIe values in dd.
         * Any error printing is already done by the init code.

diff --git a/drivers/infiniband/hw/hfi1/hfi.h b/drivers/infiniband/hw/hfi1/hfi.h
index 0a64158c2e2d0aae9afb1d4185d1810d485c13bb..611eebaeb10dd4da02d0c1fc81272f8ce20b427c 100644 (file)
--- a/drivers/infiniband/hw/hfi1/hfi.h
+++ b/drivers/infiniband/hw/hfi1/hfi.h
@@ -535,6 +535,8 @@ struct rvt_sge_state;
 #define HLS_UP (HLS_UP_INIT | HLS_UP_ARMED | HLS_UP_ACTIVE)
 #define HLS_DOWN ~(HLS_UP)
 
+#define HLS_DEFAULT HLS_DN_POLL
+
 /* use this MTU size if none other is given */
 #define HFI1_DEFAULT_ACTIVE_MTU 10240
 /* use this MTU size as the default maximum */
@@ -1108,8 +1110,7 @@ struct hfi1_devdata {
        u16 rcvegrbufsize_shift;
        /* both sides of the PCIe link are gen3 capable */
        u8 link_gen3_capable;
-       /* default link down value (poll/sleep) */
-       u8 link_default;
+       u8 dc_shutdown;
        /* localbus width (1, 2,4,8,16,32) from config space  */
        u32 lbus_width;
        /* localbus speed in MHz */
@@ -1293,7 +1294,6 @@ struct hfi1_devdata {
        u8 oui1;
        u8 oui2;
        u8 oui3;
-       u8 dc_shutdown;
 
        /* Timer and counter used to detect RcvBufOvflCnt changes */
        struct timer_list rcverr_timer;