Commit 0a5d8a9d authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Tony Nguyen
Browse files

fm10k: move error check 



The error check and set_bit are placed in such a way that sparse (C=2)
warns:
.../fm10k_pci.c:1395:9: warning: context imbalance in 'fm10k_msix_mbx_pf' - different lock contexts for basic block

Which seems a little odd, but the code can obviously be moved
to where the variable is being set without changing functionality
at all, and it even seems to make a bit more sense with the check
closer to the set.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent c40591cc

drivers/net/ethernet/intel/fm10k/fm10k_pci.c

+5 −5
Original line number Diff line number Diff line
@@ -1370,7 +1370,6 @@ static irqreturn_t fm10k_msix_mbx_pf(int __always_unused irq, void *data) 
	struct fm10k_hw *hw = &interface->hw;

	struct fm10k_mbx_info *mbx = &hw->mbx;

	u32 eicr;

	s32 err = 0;



	/* unmask any set bits related to this interrupt */

	eicr = fm10k_read_reg(hw, FM10K_EICR);
@@ -1386,15 +1385,16 @@ static irqreturn_t fm10k_msix_mbx_pf(int __always_unused irq, void *data) 


	/* service mailboxes */

	if (fm10k_mbx_trylock(interface)) {

		err = mbx->ops.process(hw, mbx);

		s32 err = mbx->ops.process(hw, mbx);



		if (err == FM10K_ERR_RESET_REQUESTED)

			set_bit(FM10K_FLAG_RESET_REQUESTED, interface->flags);



		/* handle VFLRE events */

		fm10k_iov_event(interface);

		fm10k_mbx_unlock(interface);

	}



	if (err == FM10K_ERR_RESET_REQUESTED)

		set_bit(FM10K_FLAG_RESET_REQUESTED, interface->flags);



	/* if switch toggled state we should reset GLORTs */

	if (eicr & FM10K_EICR_SWITCHNOTREADY) {

		/* force link down for at least 4 seconds */