Commit 0171f4e8 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by David S. Miller
Browse files

net: intel: Remove in_interrupt() warnings 



in_interrupt() is ill defined and does not provide what the name
suggests. The usage especially in driver code is deprecated and a tree wide
effort to clean up and consolidate the (ab)usage of in_interrupt() and
related checks is happening.

In this case the checks cover only parts of the contexts in which these
functions cannot be called. They fail to detect preemption or interrupt
disabled invocations.

As the functions which are invoked from the various places contain already
a broad variety of checks (always enabled or debug option dependent) cover
all invalid conditions already, there is no point in having inconsistent
warnings in those drivers.

Just remove them.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarAlexander Duyck <alexander.h.duyck@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c35a0824

drivers/net/ethernet/intel/e1000/e1000_main.c

+0 −1
Original line number Diff line number Diff line
@@ -536,7 +536,6 @@ void e1000_down(struct e1000_adapter *adapter) 


void e1000_reinit_locked(struct e1000_adapter *adapter)

{

	WARN_ON(in_interrupt());

	while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))

		msleep(1);

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

+0 −2
Original line number Diff line number Diff line
@@ -221,8 +221,6 @@ static bool fm10k_prepare_for_reset(struct fm10k_intfc *interface) 
{

	struct net_device *netdev = interface->netdev;



	WARN_ON(in_interrupt());



	/* put off any impending NetWatchDogTimeout */

	netif_trans_update(netdev);

drivers/net/ethernet/intel/i40e/i40e_main.c

+0 −4
Original line number Diff line number Diff line
@@ -6691,7 +6691,6 @@ static void i40e_vsi_reinit_locked(struct i40e_vsi *vsi) 
{

	struct i40e_pf *pf = vsi->back;



	WARN_ON(in_interrupt());

	while (test_and_set_bit(__I40E_CONFIG_BUSY, pf->state))

		usleep_range(1000, 2000);

	i40e_down(vsi);
@@ -8464,9 +8463,6 @@ void i40e_do_reset(struct i40e_pf *pf, u32 reset_flags, bool lock_acquired) 
{

	u32 val;



	WARN_ON(in_interrupt());





	/* do the biggest reset indicated */

	if (reset_flags & BIT_ULL(__I40E_GLOBAL_RESET_REQUESTED)) {

drivers/net/ethernet/intel/ice/ice_main.c

+0 −1
Original line number Diff line number Diff line
@@ -486,7 +486,6 @@ static void ice_do_reset(struct ice_pf *pf, enum ice_reset_req reset_type) 
	struct ice_hw *hw = &pf->hw;



	dev_dbg(dev, "reset_type 0x%x requested\n", reset_type);

	WARN_ON(in_interrupt());



	ice_prepare_for_reset(pf);

drivers/net/ethernet/intel/igb/igb_main.c

+0 −1
Original line number Diff line number Diff line
@@ -2221,7 +2221,6 @@ void igb_down(struct igb_adapter *adapter) 


void igb_reinit_locked(struct igb_adapter *adapter)

{

	WARN_ON(in_interrupt());

	while (test_and_set_bit(__IGB_RESETTING, &adapter->state))

		usleep_range(1000, 2000);

	igb_down(adapter);