summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEaswar Hariharan <easwar.hariharan@intel.com>2016-02-03 22:36:58 (GMT)
committerDoug Ledford <dledford@redhat.com>2016-03-11 01:37:59 (GMT)
commite1bf0d5ecdc49cd4e2014da0d60efa74f5714fba (patch)
treebe2e23e158a7dadaddac1ad5ea3abf0e059dbe6b
parent45b59eefcca95a3dc75b68e063390f7a1aedd90b (diff)
downloadlinux-e1bf0d5ecdc49cd4e2014da0d60efa74f5714fba.tar.xz
staging/rdma/hfi1, IB/core: Fix LinkDownReason define for consistency
LinkDownReason LocalMediaNotInstalled lacked an underscore and was inconsistent with other defines in the same family. This patch fixes this. Reviewed-by: Ira Weiny <ira.weiny@intel.com> Signed-off-by: Easwar Hariharan <easwar.hariharan@intel.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
-rw-r--r--drivers/staging/rdma/hfi1/chip.c4
-rw-r--r--drivers/staging/rdma/hfi1/platform.c2
-rw-r--r--include/rdma/opa_port_info.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
index 8c06e3b..f31cc23 100644
--- a/drivers/staging/rdma/hfi1/chip.c
+++ b/drivers/staging/rdma/hfi1/chip.c
@@ -5950,12 +5950,12 @@ static void handle_qsfp_int(struct hfi1_devdata *dd, u32 src_ctx, u64 reg)
if ((ppd->offline_disabled_reason >
HFI1_ODR_MASK(
- OPA_LINKDOWN_REASONLOCAL_MEDIA_NOT_INSTALLED)) ||
+ OPA_LINKDOWN_REASON_LOCAL_MEDIA_NOT_INSTALLED)) ||
(ppd->offline_disabled_reason ==
HFI1_ODR_MASK(OPA_LINKDOWN_REASON_NONE)))
ppd->offline_disabled_reason =
HFI1_ODR_MASK(
- OPA_LINKDOWN_REASONLOCAL_MEDIA_NOT_INSTALLED);
+ OPA_LINKDOWN_REASON_LOCAL_MEDIA_NOT_INSTALLED);
if (ppd->host_link_state == HLS_DN_POLL) {
/*
diff --git a/drivers/staging/rdma/hfi1/platform.c b/drivers/staging/rdma/hfi1/platform.c
index c3df1d8..506a827 100644
--- a/drivers/staging/rdma/hfi1/platform.c
+++ b/drivers/staging/rdma/hfi1/platform.c
@@ -816,7 +816,7 @@ void tune_serdes(struct hfi1_pportdata *ppd)
} else
ppd->offline_disabled_reason =
HFI1_ODR_MASK(
- OPA_LINKDOWN_REASONLOCAL_MEDIA_NOT_INSTALLED);
+ OPA_LINKDOWN_REASON_LOCAL_MEDIA_NOT_INSTALLED);
break;
default:
dd_dev_info(ppd->dd, "%s: Unknown port type\n", __func__);
diff --git a/include/rdma/opa_port_info.h b/include/rdma/opa_port_info.h
index a0fa975..2b95c2c 100644
--- a/include/rdma/opa_port_info.h
+++ b/include/rdma/opa_port_info.h
@@ -97,7 +97,7 @@
#define OPA_LINKDOWN_REASON_WIDTH_POLICY 41
/* 42-48 reserved */
#define OPA_LINKDOWN_REASON_DISCONNECTED 49
-#define OPA_LINKDOWN_REASONLOCAL_MEDIA_NOT_INSTALLED 50
+#define OPA_LINKDOWN_REASON_LOCAL_MEDIA_NOT_INSTALLED 50
#define OPA_LINKDOWN_REASON_NOT_INSTALLED 51
#define OPA_LINKDOWN_REASON_CHASSIS_CONFIG 52
/* 53 reserved */