summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rdma/hfi1/chip.c
diff options
context:
space:
mode:
authorEaswar Hariharan2015-10-26 15:28:31 +0100
committerGreg Kroah-Hartman2015-10-27 09:16:54 +0100
commit3c2f85b8ce8acee0502d61fb53015eabd7d4c8fb (patch)
treee03cd3534448cdc960e0f4c32ac0e3ed016e663e /drivers/staging/rdma/hfi1/chip.c
parentstaging/rdma/hfi1: Prevent host software lock up (diff)
downloadkernel-qcow2-linux-3c2f85b8ce8acee0502d61fb53015eabd7d4c8fb.tar.gz
kernel-qcow2-linux-3c2f85b8ce8acee0502d61fb53015eabd7d4c8fb.tar.xz
kernel-qcow2-linux-3c2f85b8ce8acee0502d61fb53015eabd7d4c8fb.zip
staging/rdma/hfi1: Remove QSFP_ENABLED from HFI capability mask
The QSFP interface code has been running without issues and the flag is never set to off. This patch removes the QSFP_ENABLED bit from HFI1_CAP. Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: Easwar Hariharan <easwar.hariharan@intel.com> Signed-off-by: Ira Weiny <ira.weiny@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rdma/hfi1/chip.c')
-rw-r--r--drivers/staging/rdma/hfi1/chip.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
index 1747ab6410a9..a898d3eed888 100644
--- a/drivers/staging/rdma/hfi1/chip.c
+++ b/drivers/staging/rdma/hfi1/chip.c
@@ -5714,8 +5714,7 @@ void init_qsfp(struct hfi1_pportdata *ppd)
u64 qsfp_mask;
if (loopback == LOOPBACK_SERDES || loopback == LOOPBACK_LCB ||
- ppd->dd->icode == ICODE_FUNCTIONAL_SIMULATOR ||
- !HFI1_CAP_IS_KSET(QSFP_ENABLED)) {
+ ppd->dd->icode == ICODE_FUNCTIONAL_SIMULATOR) {
ppd->driver_link_ready = 1;
return;
}