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

Commit bb658ab7 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: phy: remove phy_stop_interrupts 



Interrupts have been disabled in phy_stop() already. So we can remove
phy_stop_interrupts() and free the interrupt in phy_disconnect()
directly.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cbfd12b3

drivers/net/phy/phy.c

+0 −17
Original line number Diff line number Diff line
@@ -818,23 +818,6 @@ int phy_start_interrupts(struct phy_device *phydev) 
}

EXPORT_SYMBOL(phy_start_interrupts);



/**

 * phy_stop_interrupts - disable interrupts from a PHY device

 * @phydev: target phy_device struct

 */

int phy_stop_interrupts(struct phy_device *phydev)

{

	int err = phy_disable_interrupts(phydev);



	if (err)

		phy_error(phydev);



	free_irq(phydev->irq, phydev);



	return err;

}

EXPORT_SYMBOL(phy_stop_interrupts);



/**

 * phy_stop - Bring down the PHY link, and stop checking the status

 * @phydev: target phy_device struct

drivers/net/phy/phy_device.c

+2 −2
Original line number Diff line number Diff line
@@ -1002,8 +1002,8 @@ void phy_disconnect(struct phy_device *phydev) 
	if (phy_is_started(phydev))

		phy_stop(phydev);



	if (phydev->irq > 0)

		phy_stop_interrupts(phydev);

	if (phy_interrupt_is_valid(phydev))

		free_irq(phydev->irq, phydev);



	phydev->adjust_link = NULL;

include/linux/phy.h

+0 −1
Original line number Diff line number Diff line
@@ -951,7 +951,6 @@ int phy_aneg_done(struct phy_device *phydev); 
int phy_speed_down(struct phy_device *phydev, bool sync);

int phy_speed_up(struct phy_device *phydev);



int phy_stop_interrupts(struct phy_device *phydev);

int phy_restart_aneg(struct phy_device *phydev);

int phy_reset_after_clk_enable(struct phy_device *phydev);