From: Easwar Hariharan Date: Wed, 3 Feb 2016 22:36:58 +0000 (-0800) Subject: staging/rdma/hfi1, IB/core: Fix LinkDownReason define for consistency X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e1bf0d5ecdc49cd4e2014da0d60efa74f5714fba;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Easwar Hariharan Signed-off-by: Doug Ledford --- diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c index 8c06e3b0185a..f31cc238d6db 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 c3df1d892754..506a82766b33 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 a0fa975cd1c1..2b95c2c336eb 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 */