Commit 03ab8ca1 authored by Michael Chan's avatar Michael Chan Committed by Jakub Kicinski
Browse files

bnxt_en: Simplify bnxt_async_event_process(). 



event_data1 and event_data2 are used when processing most events.
Store these in local variables at the beginning of the function to
simplify many of the case statements.

Reviewed-by: default avatarEdwin Peer <edwin.peer@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Link: https://lore.kernel.org/r/1602493854-29283-5-git-send-email-michael.chan@broadcom.com


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

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

+3 −9
Original line number Diff line number Diff line
@@ -1980,11 +1980,12 @@ static int bnxt_async_event_process(struct bnxt *bp, 
				    struct hwrm_async_event_cmpl *cmpl)

{

	u16 event_id = le16_to_cpu(cmpl->event_id);

	u32 data1 = le32_to_cpu(cmpl->event_data1);

	u32 data2 = le32_to_cpu(cmpl->event_data2);



	/* TODO CHIMP_FW: Define event id's for link change, error etc */

	switch (event_id) {

	case ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE: {

		u32 data1 = le32_to_cpu(cmpl->event_data1);

		struct bnxt_link_info *link_info = &bp->link_info;



		if (BNXT_VF(bp))
@@ -2014,7 +2015,6 @@ static int bnxt_async_event_process(struct bnxt *bp, 
		set_bit(BNXT_HWRM_PF_UNLOAD_SP_EVENT, &bp->sp_event);

		break;

	case ASYNC_EVENT_CMPL_EVENT_ID_PORT_CONN_NOT_ALLOWED: {

		u32 data1 = le32_to_cpu(cmpl->event_data1);

		u16 port_id = BNXT_GET_EVENT_PORT(data1);



		if (BNXT_VF(bp))
@@ -2031,9 +2031,7 @@ static int bnxt_async_event_process(struct bnxt *bp, 
			goto async_event_process_exit;

		set_bit(BNXT_RESET_TASK_SILENT_SP_EVENT, &bp->sp_event);

		break;

	case ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY: {

		u32 data1 = le32_to_cpu(cmpl->event_data1);



	case ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY:

		if (!bp->fw_health)

			goto async_event_process_exit;
@@ -2053,10 +2051,8 @@ static int bnxt_async_event_process(struct bnxt *bp, 
		}

		set_bit(BNXT_FW_RESET_NOTIFY_SP_EVENT, &bp->sp_event);

		break;

	}

	case ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY: {

		struct bnxt_fw_health *fw_health = bp->fw_health;

		u32 data1 = le32_to_cpu(cmpl->event_data1);



		if (!fw_health)

			goto async_event_process_exit;
@@ -2084,8 +2080,6 @@ static int bnxt_async_event_process(struct bnxt *bp, 
		goto async_event_process_exit;

	}

	case ASYNC_EVENT_CMPL_EVENT_ID_RING_MONITOR_MSG: {

		u32 data1 = le32_to_cpu(cmpl->event_data1);

		u32 data2 = le32_to_cpu(cmpl->event_data2);

		struct bnxt_rx_ring_info *rxr;

		u16 grp_idx;

CRA Git | Maintained and supported by SUSTech CRA and CCSE