Commit 286bb998 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'igc-deadcoding' 

Dr. David Alan Gilbert says:

====================
igc deadcoding

This set removes some functions that are entirely unused
and have been since ~2018.
====================

Link: https://patch.msgid.link/20250102174142.200700-1-linux@treblig.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 71ecb1a6 c7588908

drivers/net/ethernet/intel/igc/igc_hw.h

+0 −5
Original line number Diff line number Diff line
@@ -279,9 +279,4 @@ struct net_device *igc_get_hw_dev(struct igc_hw *hw); 
#define hw_dbg(format, arg...) \

	netdev_dbg(igc_get_hw_dev(hw), format, ##arg)



s32  igc_read_pcie_cap_reg(struct igc_hw *hw, u32 reg, u16 *value);

s32  igc_write_pcie_cap_reg(struct igc_hw *hw, u32 reg, u16 *value);

void igc_read_pci_cfg(struct igc_hw *hw, u32 reg, u16 *value);

void igc_write_pci_cfg(struct igc_hw *hw, u32 reg, u16 *value);



#endif /* _IGC_HW_H_ */

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

+0 −39
Original line number Diff line number Diff line
@@ -6779,45 +6779,6 @@ static const struct net_device_ops igc_netdev_ops = { 
	.ndo_get_tstamp		= igc_get_tstamp,

};



/* PCIe configuration access */

void igc_read_pci_cfg(struct igc_hw *hw, u32 reg, u16 *value)

{

	struct igc_adapter *adapter = hw->back;



	pci_read_config_word(adapter->pdev, reg, value);

}



void igc_write_pci_cfg(struct igc_hw *hw, u32 reg, u16 *value)

{

	struct igc_adapter *adapter = hw->back;



	pci_write_config_word(adapter->pdev, reg, *value);

}



s32 igc_read_pcie_cap_reg(struct igc_hw *hw, u32 reg, u16 *value)

{

	struct igc_adapter *adapter = hw->back;



	if (!pci_is_pcie(adapter->pdev))

		return -IGC_ERR_CONFIG;



	pcie_capability_read_word(adapter->pdev, reg, value);



	return IGC_SUCCESS;

}



s32 igc_write_pcie_cap_reg(struct igc_hw *hw, u32 reg, u16 *value)

{

	struct igc_adapter *adapter = hw->back;



	if (!pci_is_pcie(adapter->pdev))

		return -IGC_ERR_CONFIG;



	pcie_capability_write_word(adapter->pdev, reg, *value);



	return IGC_SUCCESS;

}



u32 igc_rd32(struct igc_hw *hw, u32 reg)

{

	struct igc_adapter *igc = container_of(hw, struct igc_adapter, hw);

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

+0 −50
Original line number Diff line number Diff line
@@ -35,56 +35,6 @@ static s32 igc_poll_eerd_eewr_done(struct igc_hw *hw, int ee_reg) 
	return ret_val;

}



/**

 * igc_acquire_nvm - Generic request for access to EEPROM

 * @hw: pointer to the HW structure

 *

 * Set the EEPROM access request bit and wait for EEPROM access grant bit.

 * Return successful if access grant bit set, else clear the request for

 * EEPROM access and return -IGC_ERR_NVM (-1).

 */

s32 igc_acquire_nvm(struct igc_hw *hw)

{

	s32 timeout = IGC_NVM_GRANT_ATTEMPTS;

	u32 eecd = rd32(IGC_EECD);

	s32 ret_val = 0;



	wr32(IGC_EECD, eecd | IGC_EECD_REQ);

	eecd = rd32(IGC_EECD);



	while (timeout) {

		if (eecd & IGC_EECD_GNT)

			break;

		udelay(5);

		eecd = rd32(IGC_EECD);

		timeout--;

	}



	if (!timeout) {

		eecd &= ~IGC_EECD_REQ;

		wr32(IGC_EECD, eecd);

		hw_dbg("Could not acquire NVM grant\n");

		ret_val = -IGC_ERR_NVM;

	}



	return ret_val;

}



/**

 * igc_release_nvm - Release exclusive access to EEPROM

 * @hw: pointer to the HW structure

 *

 * Stop any current commands to the EEPROM and clear the EEPROM request bit.

 */

void igc_release_nvm(struct igc_hw *hw)

{

	u32 eecd;



	eecd = rd32(IGC_EECD);

	eecd &= ~IGC_EECD_REQ;

	wr32(IGC_EECD, eecd);

}



/**

 * igc_read_nvm_eerd - Reads EEPROM using EERD register

 * @hw: pointer to the HW structure

drivers/net/ethernet/intel/igc/igc_nvm.h

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
#ifndef _IGC_NVM_H_

#define _IGC_NVM_H_



s32 igc_acquire_nvm(struct igc_hw *hw);

void igc_release_nvm(struct igc_hw *hw);

s32 igc_read_mac_addr(struct igc_hw *hw);

s32 igc_read_nvm_eerd(struct igc_hw *hw, u16 offset, u16 words, u16 *data);

s32 igc_validate_nvm_checksum(struct igc_hw *hw);