Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 156d24d7 authored by Ira Weiny's avatar Ira Weiny Committed by Doug Ledford
Browse files

IB/hfi1: Remove unused link_default variable 



devdata->link_default is no longer variable

Maintain number of holes by moving dc_shutdown

Reviewed-by: default avatarSebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent aadd7020

drivers/infiniband/hw/hfi1/chip.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -9956,7 +9956,7 @@ int hfi1_get_ib_cfg(struct hfi1_pportdata *ppd, int which) 
		val = ppd->phy_error_threshold;

		val = ppd->phy_error_threshold;

		break;

		break;

	case HFI1_IB_CFG_LINKDEFAULT: /* IB link default (sleep/poll) */

	case HFI1_IB_CFG_LINKDEFAULT: /* IB link default (sleep/poll) */

		val = dd->link_default;

		val = HLS_DEFAULT;

		break;

		break;





	case HFI1_IB_CFG_HRTBT: /* Heartbeat off/enable/auto */

	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;

	orig_new_state = state;

	if (state == HLS_DN_DOWNDEF)

	if (state == HLS_DN_DOWNDEF)

		state = dd->link_default;

		state = HLS_DEFAULT;





	/* interpret poll -> poll as a link bounce */

	/* interpret poll -> poll as a link bounce */

	poll_bounce = ppd->host_link_state == HLS_DN_POLL &&

	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);

		init_vl_arb_caches(ppd);

	}

	}





	dd->link_default = HLS_DN_POLL;



	/*

	/*

	 * Do remaining PCIe setup and save PCIe values in dd.

	 * Do remaining PCIe setup and save PCIe values in dd.

	 * Any error printing is already done by the init code.

	 * Any error printing is already done by the init code.

drivers/infiniband/hw/hfi1/hfi.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -535,6 +535,8 @@ struct rvt_sge_state; 
#define HLS_UP (HLS_UP_INIT | HLS_UP_ARMED | HLS_UP_ACTIVE)

#define HLS_UP (HLS_UP_INIT | HLS_UP_ARMED | HLS_UP_ACTIVE)

#define HLS_DOWN ~(HLS_UP)

#define HLS_DOWN ~(HLS_UP)





#define HLS_DEFAULT HLS_DN_POLL



/* use this MTU size if none other is given */

/* use this MTU size if none other is given */

#define HFI1_DEFAULT_ACTIVE_MTU 10240

#define HFI1_DEFAULT_ACTIVE_MTU 10240

/* use this MTU size as the default maximum */

/* use this MTU size as the default maximum */
@@ -1108,8 +1110,7 @@ struct hfi1_devdata { 
	u16 rcvegrbufsize_shift;

	u16 rcvegrbufsize_shift;

	/* both sides of the PCIe link are gen3 capable */

	/* both sides of the PCIe link are gen3 capable */

	u8 link_gen3_capable;

	u8 link_gen3_capable;

	/* default link down value (poll/sleep) */

	u8 dc_shutdown;

	u8 link_default;

	/* localbus width (1, 2,4,8,16,32) from config space  */

	/* localbus width (1, 2,4,8,16,32) from config space  */

	u32 lbus_width;

	u32 lbus_width;

	/* localbus speed in MHz */

	/* localbus speed in MHz */
@@ -1293,7 +1294,6 @@ struct hfi1_devdata { 
	u8 oui1;

	u8 oui1;

	u8 oui2;

	u8 oui2;

	u8 oui3;

	u8 oui3;

	u8 dc_shutdown;





	/* Timer and counter used to detect RcvBufOvflCnt changes */

	/* Timer and counter used to detect RcvBufOvflCnt changes */

	struct timer_list rcverr_timer;

	struct timer_list rcverr_timer;