staging/rdma/hfi1: Remove spurious error messages

Changed the order in which diagnostics messages are printed,
taking into account the cases where the errors are handled in
rcv_hdrerr() and no further message is needed to report.

Reviewed-by: Mark Debbage <mark.debbage@intel.com>
Reviewed-by: Arthur Kepner <arthur.kepner@intel.com>
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Ignacio Hernandez <ignacio.hernandez@intel.com>
Signed-off-by: Jubin John <jubin.john@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rdma/hfi1/driver.c b/drivers/staging/rdma/hfi1/driver.c
index 9a4ec09af02011104d6fb4d2caab253252bc4ae7..72ab5e145f495f4e4ca908e7fec7852396430728 100644 (file)
--- a/drivers/staging/rdma/hfi1/driver.c
+++ b/drivers/staging/rdma/hfi1/driver.c
@@ -1156,20 +1156,20 @@ void handle_eflags(struct hfi1_packet *packet)
        struct hfi1_ctxtdata *rcd = packet->rcd;
        u32 rte = rhf_rcv_type_err(packet->rhf);
 
-       dd_dev_err(rcd->dd,
-               "receive context %d: rhf 0x%016llx, errs [ %s%s%s%s%s%s%s%s] rte 0x%x\n",
-               rcd->ctxt, packet->rhf,
-               packet->rhf & RHF_K_HDR_LEN_ERR ? "k_hdr_len " : "",
-               packet->rhf & RHF_DC_UNC_ERR ? "dc_unc " : "",
-               packet->rhf & RHF_DC_ERR ? "dc " : "",
-               packet->rhf & RHF_TID_ERR ? "tid " : "",
-               packet->rhf & RHF_LEN_ERR ? "len " : "",
-               packet->rhf & RHF_ECC_ERR ? "ecc " : "",
-               packet->rhf & RHF_VCRC_ERR ? "vcrc " : "",
-               packet->rhf & RHF_ICRC_ERR ? "icrc " : "",
-               rte);
-
        rcv_hdrerr(rcd, rcd->ppd, packet);
+       if (rhf_err_flags(packet->rhf))
+               dd_dev_err(rcd->dd,
+                          "receive context %d: rhf 0x%016llx, errs [ %s%s%s%s%s%s%s%s] rte 0x%x\n",
+                          rcd->ctxt, packet->rhf,
+                          packet->rhf & RHF_K_HDR_LEN_ERR ? "k_hdr_len " : "",
+                          packet->rhf & RHF_DC_UNC_ERR ? "dc_unc " : "",
+                          packet->rhf & RHF_DC_ERR ? "dc " : "",
+                          packet->rhf & RHF_TID_ERR ? "tid " : "",
+                          packet->rhf & RHF_LEN_ERR ? "len " : "",
+                          packet->rhf & RHF_ECC_ERR ? "ecc " : "",
+                          packet->rhf & RHF_VCRC_ERR ? "vcrc " : "",
+                          packet->rhf & RHF_ICRC_ERR ? "icrc " : "",
+                          rte);
 }
 
 /*