Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 386164d9 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

e1000e: Switch e1000e_up to void, drop code checking for error result 



The function e1000e_up always returns 0.  As such we can convert it to a
void and just ignore the results.  This allows us to drop some code in a
couple spots as we no longer need to worry about non-zero return values.

Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent cb4396ed

drivers/net/ethernet/intel/e1000e/e1000.h

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ extern const char e1000e_driver_version[]; 
void e1000e_check_options(struct e1000_adapter *adapter);

void e1000e_set_ethtool_ops(struct net_device *netdev);



int e1000e_up(struct e1000_adapter *adapter);

void e1000e_up(struct e1000_adapter *adapter);

void e1000e_down(struct e1000_adapter *adapter, bool reset);

void e1000e_reinit_locked(struct e1000_adapter *adapter);

void e1000e_reset(struct e1000_adapter *adapter);

drivers/net/ethernet/intel/e1000e/netdev.c

+4 −11
Original line number Diff line number Diff line
@@ -4146,7 +4146,7 @@ void e1000e_reset(struct e1000_adapter *adapter) 


}



int e1000e_up(struct e1000_adapter *adapter)

void e1000e_up(struct e1000_adapter *adapter)

{

	struct e1000_hw *hw = &adapter->hw;
@@ -4166,8 +4166,6 @@ int e1000e_up(struct e1000_adapter *adapter) 
		ew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER);

	else

		ew32(ICS, E1000_ICS_LSC);



	return 0;

}



static void e1000e_flush_descriptors(struct e1000_adapter *adapter)
@@ -6633,7 +6631,7 @@ static int e1000e_pm_runtime_resume(struct device *dev) 
		return rc;



	if (netdev->flags & IFF_UP)

		rc = e1000e_up(adapter);

		e1000e_up(adapter);



	return rc;

}
@@ -6824,13 +6822,8 @@ static void e1000_io_resume(struct pci_dev *pdev) 


	e1000_init_manageability_pt(adapter);



	if (netif_running(netdev)) {

		if (e1000e_up(adapter)) {

			dev_err(&pdev->dev,

				"can't bring device back up after reset\n");

			return;

		}

	}

	if (netif_running(netdev))

		e1000e_up(adapter);



	netif_device_attach(netdev);