Commit 871127e6 authored by Michael Chan's avatar Michael Chan Committed by Jakub Kicinski
Browse files

bnxt_en: Convert to use netif_level() helpers. 



Use the various netif_level() helpers to simplify the C code.  This was
suggested by Joe Perches.

Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Link: https://lore.kernel.org/r/1611642024-3166-1-git-send-email-michael.chan@broadcom.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2961f562

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

+14 −20
Original line number Diff line number Diff line
@@ -1266,8 +1266,7 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, 
	} else {

		tpa_info->hash_type = PKT_HASH_TYPE_NONE;

		tpa_info->gso_type = 0;

		if (netif_msg_rx_err(bp))

			netdev_warn(bp->dev, "TPA packet without valid hash\n");

		netif_warn(bp, rx_err, bp->dev, "TPA packet without valid hash\n");

	}

	tpa_info->flags2 = le32_to_cpu(tpa_start1->rx_tpa_start_cmp_flags2);

	tpa_info->metadata = le32_to_cpu(tpa_start1->rx_tpa_start_cmp_metadata);
@@ -2039,12 +2038,11 @@ static int bnxt_async_event_process(struct bnxt *bp, 
			fatal_str = "fatal";

			set_bit(BNXT_STATE_FW_FATAL_COND, &bp->state);

		}

		if (netif_msg_hw(bp)) {

			netdev_warn(bp->dev, "Firmware %s reset event, data1: 0x%x, data2: 0x%x, min wait %u ms, max wait %u ms\n",

		netif_warn(bp, hw, bp->dev,

			   "Firmware %s reset event, data1: 0x%x, data2: 0x%x, min wait %u ms, max wait %u ms\n",

			   fatal_str, data1, data2,

			   bp->fw_reset_min_dsecs * 100,

			   bp->fw_reset_max_dsecs * 100);

		}

		set_bit(BNXT_FW_RESET_NOTIFY_SP_EVENT, &bp->sp_event);

		break;

	}
@@ -2059,13 +2057,11 @@ static int bnxt_async_event_process(struct bnxt *bp, 
		if (!fw_health->enabled)

			break;



		if (netif_msg_drv(bp))

			netdev_info(bp->dev, "Error recovery info: error recovery[%d], master[%d], reset count[0x%x], health status: 0x%x\n",

		netif_info(bp, drv, bp->dev,

			   "Error recovery info: error recovery[%d], master[%d], reset count[0x%x], health status: 0x%x\n",

			   fw_health->enabled, fw_health->master,

				    bnxt_fw_health_readl(bp,

							 BNXT_FW_RESET_CNT_REG),

				    bnxt_fw_health_readl(bp,

							 BNXT_FW_HEALTH_REG));

			   bnxt_fw_health_readl(bp, BNXT_FW_RESET_CNT_REG),

			   bnxt_fw_health_readl(bp, BNXT_FW_HEALTH_REG));

		fw_health->tmr_multiplier =

			DIV_ROUND_UP(fw_health->polling_dsecs * HZ,

				     bp->current_interval * 10);
@@ -2077,11 +2073,9 @@ static int bnxt_async_event_process(struct bnxt *bp, 
		goto async_event_process_exit;

	}

	case ASYNC_EVENT_CMPL_EVENT_ID_DEBUG_NOTIFICATION:

		if (netif_msg_hw(bp)) {

			netdev_notice(bp->dev,

		netif_notice(bp, hw, bp->dev,

			     "Received firmware debug notification, data1: 0x%x, data2: 0x%x\n",

			     data1, data2);

		}

		goto async_event_process_exit;

	case ASYNC_EVENT_CMPL_EVENT_ID_RING_MONITOR_MSG: {

		struct bnxt_rx_ring_info *rxr;