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

Commit cb130a0b authored by Bimmy Pujari's avatar Bimmy Pujari Committed by Jeff Kirsher
Browse files

i40evf: remove unnecessary error checking against i40evf_up_complete 



Function i40evf_up_complete() always returns success. Changed this to a
void type and removed the code that checks the return status and prints
an error message.

Change-ID: I8c400f174786b9c855f679e470f35af292fb50ad
Signed-off-by: default avatarBimmy Pujari <bimmy.pujari@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3f341acc

drivers/net/ethernet/intel/i40evf/i40evf_main.c

+3 −8
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ static void i40evf_configure(struct i40evf_adapter *adapter) 
 * i40evf_up_complete - Finish the last steps of bringing up a connection

 * @adapter: board private structure

 **/

static int i40evf_up_complete(struct i40evf_adapter *adapter)

static void i40evf_up_complete(struct i40evf_adapter *adapter)

{

	adapter->state = __I40EVF_RUNNING;

	clear_bit(__I40E_DOWN, &adapter->vsi.state);
@@ -1016,7 +1016,6 @@ static int i40evf_up_complete(struct i40evf_adapter *adapter) 


	adapter->aq_required |= I40EVF_FLAG_AQ_ENABLE_QUEUES;

	mod_timer_pending(&adapter->watchdog_timer, jiffies + 1);

	return 0;

}



/**
@@ -1827,9 +1826,7 @@ static void i40evf_reset_task(struct work_struct *work) 


		i40evf_configure(adapter);



		err = i40evf_up_complete(adapter);

		if (err)

			goto reset_err;

		i40evf_up_complete(adapter);



		i40evf_irq_enable(adapter, true);

	} else {
@@ -2059,9 +2056,7 @@ static int i40evf_open(struct net_device *netdev) 
	i40evf_add_filter(adapter, adapter->hw.mac.addr);

	i40evf_configure(adapter);



	err = i40evf_up_complete(adapter);

	if (err)

		goto err_req_irq;

	i40evf_up_complete(adapter);



	i40evf_irq_enable(adapter, true);