Commit d098538e authored by Sasha Neftin's avatar Sasha Neftin Committed by Tony Nguyen
Browse files

igc: Remove igc_set_spd_dplx method 



igc_set_spd_dplx method is not used. This patch comes to tidy up
the driver code.

Reported-by: default avatarMuhammad Husaini Zulkifli <muhammad.husaini.zulkifli@intel.com>
Signed-off-by: default avatarSasha Neftin <sasha.neftin@intel.com>
Tested-by: default avatarNaama Meir <naamax.meir@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent ecd17a87

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

+0 −1
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ int igc_reinit_queues(struct igc_adapter *adapter); 
void igc_write_rss_indir_tbl(struct igc_adapter *adapter);

bool igc_has_link(struct igc_adapter *adapter);

void igc_reset(struct igc_adapter *adapter);

int igc_set_spd_dplx(struct igc_adapter *adapter, u32 spd, u8 dplx);

void igc_update_stats(struct igc_adapter *adapter);

void igc_disable_rx_ring(struct igc_ring *ring);

void igc_enable_rx_ring(struct igc_ring *ring);

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

+0 −50
Original line number Diff line number Diff line
@@ -6187,56 +6187,6 @@ u32 igc_rd32(struct igc_hw *hw, u32 reg) 
	return value;

}



int igc_set_spd_dplx(struct igc_adapter *adapter, u32 spd, u8 dplx)

{

	struct igc_mac_info *mac = &adapter->hw.mac;



	mac->autoneg = false;



	/* Make sure dplx is at most 1 bit and lsb of speed is not set

	 * for the switch() below to work

	 */

	if ((spd & 1) || (dplx & ~1))

		goto err_inval;



	switch (spd + dplx) {

	case SPEED_10 + DUPLEX_HALF:

		mac->forced_speed_duplex = ADVERTISE_10_HALF;

		break;

	case SPEED_10 + DUPLEX_FULL:

		mac->forced_speed_duplex = ADVERTISE_10_FULL;

		break;

	case SPEED_100 + DUPLEX_HALF:

		mac->forced_speed_duplex = ADVERTISE_100_HALF;

		break;

	case SPEED_100 + DUPLEX_FULL:

		mac->forced_speed_duplex = ADVERTISE_100_FULL;

		break;

	case SPEED_1000 + DUPLEX_FULL:

		mac->autoneg = true;

		adapter->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL;

		break;

	case SPEED_1000 + DUPLEX_HALF: /* not supported */

		goto err_inval;

	case SPEED_2500 + DUPLEX_FULL:

		mac->autoneg = true;

		adapter->hw.phy.autoneg_advertised = ADVERTISE_2500_FULL;

		break;

	case SPEED_2500 + DUPLEX_HALF: /* not supported */

	default:

		goto err_inval;

	}



	/* clear MDI, MDI(-X) override is only allowed when autoneg enabled */

	adapter->hw.phy.mdix = AUTO_ALL_MODES;



	return 0;



err_inval:

	netdev_err(adapter->netdev, "Unsupported Speed/Duplex configuration\n");

	return -EINVAL;

}



/**

 * igc_probe - Device Initialization Routine

 * @pdev: PCI device information struct