Commit 2084ccf6 authored Jun 14, 2020 by Michael Chan Committed by David S. Miller Jun 15, 2020

bnxt_en: Simplify bnxt_resume().



The separate steps we do in bnxt_resume() can be done more simply by
calling bnxt_hwrm_func_qcaps().  This change will add an extra
__bnxt_hwrm_func_qcaps() call which is needed anyway on older
firmware.

Fixes: f9b69d7f ("bnxt_en: Fix suspend/resume path on 57500 chips")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 38af8f2d

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+2 −12

Original line number	Diff line number	Diff line
		@@ -12133,19 +12133,9 @@ static int bnxt_resume(struct device *device)
		goto resume_exit;
		}

		if (bnxt_hwrm_queue_qportcfg(bp)) {
		rc = -ENODEV;
		goto resume_exit;
		}

		if (bp->hwrm_spec_code >= 0x10803) {
		if (bnxt_alloc_ctx_mem(bp)) {
		rc = -ENODEV;
		rc = bnxt_hwrm_func_qcaps(bp);
		if (rc)
		goto resume_exit;
		}
		}
		if (BNXT_NEW_RM(bp))
		bnxt_hwrm_func_resc_qcaps(bp, false);

		if (bnxt_hwrm_func_drv_rgtr(bp, NULL, 0, false)) {
		rc = -ENODEV;

Admin message