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

Commit 76ef8c07 authored by Easwar Hariharan's avatar Easwar Hariharan Committed by Doug Ledford
Browse files

staging/rdma/hfi1: cleanup messages on qsfp_read() failure 



The ":" in "%s:" adds no value.

Reviewed-by: default avatarDean Luick <dean.luick@intel.com>
Signed-off-by: default avatarEaswar Hariharan <easwar.hariharan@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent a9c05e35

drivers/staging/rdma/hfi1/qsfp.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -330,48 +330,48 @@ int refresh_qsfp_cache(struct hfi1_pportdata *ppd, struct qsfp_data *cp) 
			/* all */

			/* all */

			ret = qsfp_read(ppd, target, 384, cache + 256, 128);

			ret = qsfp_read(ppd, target, 384, cache + 256, 128);

			if (ret <= 0 || ret != 128) {

			if (ret <= 0 || ret != 128) {

				dd_dev_info(ppd->dd, "%s: failed\n", __func__);

				dd_dev_info(ppd->dd, "%s failed\n", __func__);

				goto bail;

				goto bail;

			}

			}

			ret = qsfp_read(ppd, target, 640, cache + 384, 128);

			ret = qsfp_read(ppd, target, 640, cache + 384, 128);

			if (ret <= 0 || ret != 128) {

			if (ret <= 0 || ret != 128) {

				dd_dev_info(ppd->dd, "%s: failed\n", __func__);

				dd_dev_info(ppd->dd, "%s failed\n", __func__);

				goto bail;

				goto bail;

			}

			}

			ret = qsfp_read(ppd, target, 896, cache + 512, 128);

			ret = qsfp_read(ppd, target, 896, cache + 512, 128);

			if (ret <= 0 || ret != 128) {

			if (ret <= 0 || ret != 128) {

				dd_dev_info(ppd->dd, "%s: failed\n", __func__);

				dd_dev_info(ppd->dd, "%s failed\n", __func__);

				goto bail;

				goto bail;

			}

			}

		} else if ((cache[195] & 0x80) == 0x80) {

		} else if ((cache[195] & 0x80) == 0x80) {

			/* only page 2 and 3 */

			/* only page 2 and 3 */

			ret = qsfp_read(ppd, target, 640, cache + 384, 128);

			ret = qsfp_read(ppd, target, 640, cache + 384, 128);

			if (ret <= 0 || ret != 128) {

			if (ret <= 0 || ret != 128) {

				dd_dev_info(ppd->dd, "%s: failed\n", __func__);

				dd_dev_info(ppd->dd, "%s failed\n", __func__);

				goto bail;

				goto bail;

			}

			}

			ret = qsfp_read(ppd, target, 896, cache + 512, 128);

			ret = qsfp_read(ppd, target, 896, cache + 512, 128);

			if (ret <= 0 || ret != 128) {

			if (ret <= 0 || ret != 128) {

				dd_dev_info(ppd->dd, "%s: failed\n", __func__);

				dd_dev_info(ppd->dd, "%s failed\n", __func__);

				goto bail;

				goto bail;

			}

			}

		} else if ((cache[195] & 0x40) == 0x40) {

		} else if ((cache[195] & 0x40) == 0x40) {

			/* only page 1 and 3 */

			/* only page 1 and 3 */

			ret = qsfp_read(ppd, target, 384, cache + 256, 128);

			ret = qsfp_read(ppd, target, 384, cache + 256, 128);

			if (ret <= 0 || ret != 128) {

			if (ret <= 0 || ret != 128) {

				dd_dev_info(ppd->dd, "%s: failed\n", __func__);

				dd_dev_info(ppd->dd, "%s failed\n", __func__);

				goto bail;

				goto bail;

			}

			}

			ret = qsfp_read(ppd, target, 896, cache + 512, 128);

			ret = qsfp_read(ppd, target, 896, cache + 512, 128);

			if (ret <= 0 || ret != 128) {

			if (ret <= 0 || ret != 128) {

				dd_dev_info(ppd->dd, "%s: failed\n", __func__);

				dd_dev_info(ppd->dd, "%s failed\n", __func__);

				goto bail;

				goto bail;

			}

			}

		} else {

		} else {

			/* only page 3 */

			/* only page 3 */

			ret = qsfp_read(ppd, target, 896, cache + 512, 128);

			ret = qsfp_read(ppd, target, 896, cache + 512, 128);

			if (ret <= 0 || ret != 128) {

			if (ret <= 0 || ret != 128) {

				dd_dev_info(ppd->dd, "%s: failed\n", __func__);

				dd_dev_info(ppd->dd, "%s failed\n", __func__);

				goto bail;

				goto bail;

			}

			}

		}

		}