Commit fccf939e authored by Sasha Neftin's avatar Sasha Neftin Committed by Jeff Kirsher
Browse files

igc: Remove no need declaration of the igc_irq_enable 



We want to avoid forward-declarations of function if possible.
Rearrange the igc_irq_enable function implementation.

Signed-off-by: default avatarSasha Neftin <sasha.neftin@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a146ea02

drivers/net/ethernet/intel/igc/igc_main.c

+23 −24
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ static void igc_assign_vector(struct igc_q_vector *q_vector, int msix_vector); 
static void igc_free_q_vector(struct igc_adapter *adapter, int v_idx);

static void igc_free_q_vectors(struct igc_adapter *adapter);

static void igc_irq_disable(struct igc_adapter *adapter);

static void igc_irq_enable(struct igc_adapter *adapter);



enum latency_range {

	lowest_latency = 0,
@@ -2243,6 +2242,29 @@ static void igc_configure_msix(struct igc_adapter *adapter) 
	wrfl();

}



/**

 * igc_irq_enable - Enable default interrupt generation settings

 * @adapter: board private structure

 */

static void igc_irq_enable(struct igc_adapter *adapter)

{

	struct igc_hw *hw = &adapter->hw;



	if (adapter->msix_entries) {

		u32 ims = IGC_IMS_LSC | IGC_IMS_DOUTSYNC | IGC_IMS_DRSTA;

		u32 regval = rd32(IGC_EIAC);



		wr32(IGC_EIAC, regval | adapter->eims_enable_mask);

		regval = rd32(IGC_EIAM);

		wr32(IGC_EIAM, regval | adapter->eims_enable_mask);

		wr32(IGC_EIMS, adapter->eims_enable_mask);

		wr32(IGC_IMS, ims);

	} else {

		wr32(IGC_IMS, IMS_ENABLE_MASK | IGC_IMS_DRSTA);

		wr32(IGC_IAM, IMS_ENABLE_MASK | IGC_IMS_DRSTA);

	}

}



/**

 * igc_up - Open the interface and prepare it to handle traffic

 * @adapter: board private structure
@@ -3972,29 +3994,6 @@ static void igc_irq_disable(struct igc_adapter *adapter) 
	}

}



/**

 * igc_irq_enable - Enable default interrupt generation settings

 * @adapter: board private structure

 */

static void igc_irq_enable(struct igc_adapter *adapter)

{

	struct igc_hw *hw = &adapter->hw;



	if (adapter->msix_entries) {

		u32 ims = IGC_IMS_LSC | IGC_IMS_DOUTSYNC | IGC_IMS_DRSTA;

		u32 regval = rd32(IGC_EIAC);



		wr32(IGC_EIAC, regval | adapter->eims_enable_mask);

		regval = rd32(IGC_EIAM);

		wr32(IGC_EIAM, regval | adapter->eims_enable_mask);

		wr32(IGC_EIMS, adapter->eims_enable_mask);

		wr32(IGC_IMS, ims);

	} else {

		wr32(IGC_IMS, IMS_ENABLE_MASK | IGC_IMS_DRSTA);

		wr32(IGC_IAM, IMS_ENABLE_MASK | IGC_IMS_DRSTA);

	}

}



/**

 * igc_request_irq - initialize interrupts

 * @adapter: Pointer to adapter structure

CRA Git | Maintained and supported by SUSTech CRA and CCSE