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

Commit 9f58ba00 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: emac: remove unused phy interrupt"

parents b0f1d506 27c8c374

drivers/net/ethernet/msm/emac/emac_hw.c

+0 −6
Original line number Diff line number Diff line
@@ -254,12 +254,6 @@ int emac_write_phy_reg(struct emac_hw *hw, u16 phy_addr, 
	return retval;

}



int emac_hw_ack_phy_intr(struct emac_hw *hw)

{

	/* ack phy interrupt */

	return 0;

}



int emac_hw_init_sgmii(struct emac_hw *hw)

{

	int i;

drivers/net/ethernet/msm/emac/emac_main.c

+0 −12
Original line number Diff line number Diff line
@@ -1050,10 +1050,6 @@ static irqreturn_t emac_isr(int _irq, void *data) 
		if (status == 0)

			break;



		/* ack PHY interrupt */

		if (status & ISR_GPHY_LINK)

			emac_hw_ack_phy_intr(hw);



		if (status & ISR_ERROR) {

			emac_warn(adpt, intr, "isr error status 0x%x\n",

				  status & ISR_ERROR);
@@ -2332,9 +2328,6 @@ static int emac_runtime_suspend(struct device *device) 
	struct emac_hw *hw = &adpt->hw;

	u32 wufc = adpt->wol;



	/* clear phy interrupt */

	emac_hw_ack_phy_intr(hw);



	emac_hw_config_pow_save(hw, adpt->hw.link_speed, !!wufc,

				!!(wufc & EMAC_WOL_MAGIC));

	return 0;
@@ -2410,11 +2403,6 @@ static int emac_suspend(struct device *device) 
	hw->link_speed = speed;

	hw->link_up = link_up;



	/* clear phy interrupt */

	retval = emac_hw_ack_phy_intr(hw);

	if (retval)

		return retval;



	emac_hw_config_wol(hw, wufc);

	emac_hw_config_pow_save(hw, adpt->hw.link_speed, !!wufc,

				!!(wufc & EMAC_WOL_MAGIC));