bnxt_en: Convert to use netif_level() helpers.
Michael Chan
maintainerPATCH 1/1 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 <[email protected]>
Signed-off-by Michael Chan <[email protected]>
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 34 ++++++++++------------- 1 file changed, 14 insertions(+), 20 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +14 -20
@@ -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" , - fatal_str, data1, data2, - bp->fw_reset_min_dsecs *100 , - bp->fw_reset_max_dsecs *100 ); - } +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" , - 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 )); +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 )); 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, -"Received firmware debug notification, data1: 0x%x, data2: 0x%x\n" , - data1, data2); - } +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;
Signature · 1 line
2.18.1
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 8 lines · On Tue, 26 Jan 2021 01:20:24 -0500 you wrote:
Use the various
netif_level()helpers to simplify the C code. This was suggested by Joe Perches.Cc Joe Perches <[email protected]>Signed-off-by Michael Chan <[email protected]>--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 34 ++++++++++------------- 1 file changed, 14 insertions(+), 20 deletions(-)
Here is the summary with links:
- [net-next] bnxt_en: Convert to use netif_level() helpers.
https://git.kernel.org/netdev/net-next/c/871127e6ab0d
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html