xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bnxt_en: Convert to use netif_level() helpers.

Browse Source 
[ Upstream commit 871127e6ab0d6abb904cec81fc022baf6953be1f ]

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: Michael Chan <michael.chan@broadcom.com>
Link: https://lore.kernel.org/r/1611642024-3166-1-git-send-email-michael.chan@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Michael Chan
2021-01-26 01:20:24 -05:00
committed by Greg Kroah-Hartman
parent 01cad477a9
commit 639a2eddb7
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/ethernet/broadcom/bnxt/bnxt.c
View File

@@ -1305,8 +1305,7 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,
} else { } else {
tpa_info->hash_type = PKT_HASH_TYPE_NONE; tpa_info->hash_type = PKT_HASH_TYPE_NONE;
tpa_info->gso_type = 0; tpa_info->gso_type = 0;
if (netif_msg_rx_err(bp)) netif_warn(bp, rx_err, bp->dev, "TPA packet without valid hash\n");
netdev_warn(bp->dev, "TPA packet without valid hash\n");
} }
tpa_info->flags2 = le32_to_cpu(tpa_start1->rx_tpa_start_cmp_flags2); 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); tpa_info->metadata = le32_to_cpu(tpa_start1->rx_tpa_start_cmp_metadata);
@@ -2099,12 +2098,11 @@ static int bnxt_async_event_process(struct bnxt *bp,
fatal_str = "fatal"; fatal_str = "fatal";
set_bit(BNXT_STATE_FW_FATAL_COND, &bp->state); set_bit(BNXT_STATE_FW_FATAL_COND, &bp->state);
} }
if (netif_msg_hw(bp)) { netif_warn(bp, hw, bp->dev,
netdev_warn(bp->dev, "Firmware %s reset event, data1: 0x%x, data2: 0x%x, min wait %u ms, max wait %u ms\n", "Firmware %s reset event, data1: 0x%x, data2: 0x%x, min wait %u ms, max wait %u ms\n",
fatal_str, data1, data2, fatal_str, data1, data2,
bp->fw_reset_min_dsecs * 100, bp->fw_reset_min_dsecs * 100,
bp->fw_reset_max_dsecs * 100); bp->fw_reset_max_dsecs * 100);
}
set_bit(BNXT_FW_RESET_NOTIFY_SP_EVENT, &bp->sp_event); set_bit(BNXT_FW_RESET_NOTIFY_SP_EVENT, &bp->sp_event);
break; break;
} }
@@ -2119,13 +2117,11 @@ static int bnxt_async_event_process(struct bnxt *bp,
if (!fw_health->enabled) if (!fw_health->enabled)
break; break;
if (netif_msg_drv(bp)) netif_info(bp, drv, bp->dev,
netdev_info(bp->dev, "Error recovery info: error recovery[%d], master[%d], reset count[0x%x], health status: 0x%x\n", "Error recovery info: error recovery[%d], master[%d], reset count[0x%x], health status: 0x%x\n",
fw_health->enabled, fw_health->master, fw_health->enabled, fw_health->master,
bnxt_fw_health_readl(bp, bnxt_fw_health_readl(bp, BNXT_FW_RESET_CNT_REG),
BNXT_FW_RESET_CNT_REG), bnxt_fw_health_readl(bp, BNXT_FW_HEALTH_REG));
bnxt_fw_health_readl(bp,
BNXT_FW_HEALTH_REG));
fw_health->tmr_multiplier = fw_health->tmr_multiplier =
DIV_ROUND_UP(fw_health->polling_dsecs * HZ, DIV_ROUND_UP(fw_health->polling_dsecs * HZ,
bp->current_interval * 10); bp->current_interval * 10);
@@ -2137,11 +2133,9 @@ static int bnxt_async_event_process(struct bnxt *bp,
goto async_event_process_exit; goto async_event_process_exit;
} }
case ASYNC_EVENT_CMPL_EVENT_ID_DEBUG_NOTIFICATION: case ASYNC_EVENT_CMPL_EVENT_ID_DEBUG_NOTIFICATION:
if (netif_msg_hw(bp)) { netif_notice(bp, hw, bp->dev,
netdev_notice(bp->dev,
"Received firmware debug notification, data1: 0x%x, data2: 0x%x\n", "Received firmware debug notification, data1: 0x%x, data2: 0x%x\n",
data1, data2); data1, data2);
}
goto async_event_process_exit; goto async_event_process_exit;
case ASYNC_EVENT_CMPL_EVENT_ID_RING_MONITOR_MSG: { case ASYNC_EVENT_CMPL_EVENT_ID_RING_MONITOR_MSG: {
struct bnxt_rx_ring_info *rxr; struct bnxt_rx_ring_info *rxr;