Commit 45f52f12 authored by Ioana Ciornei's avatar Ioana Ciornei Committed by Jakub Kicinski
Browse files

net: phy: nxp-tja11xx: remove the use of .ack_interrupt() 



In preparation of removing the .ack_interrupt() callback, we must replace
its occurrences (aka phy_clear_interrupt), from the 2 places where it is
called from (phy_enable_interrupts and phy_disable_interrupts), with
equivalent functionality.

This means that clearing interrupts now becomes something that the PHY
driver is responsible of doing, before enabling interrupts and after
clearing them. Make this driver follow the new contract.

Cc: Marek Vasut <marex@denx.de>
Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 52b1984a

drivers/net/phy/nxp-tja11xx.c

+15 −4
Original line number Diff line number Diff line
@@ -600,11 +600,24 @@ static int tja11xx_ack_interrupt(struct phy_device *phydev) 
static int tja11xx_config_intr(struct phy_device *phydev)

{

	int value = 0;

	int err;



	if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {

		err = tja11xx_ack_interrupt(phydev);

		if (err)

			return err;



	if (phydev->interrupts == PHY_INTERRUPT_ENABLED)

		value = MII_INTEN_LINK_FAIL | MII_INTEN_LINK_UP;

		err = phy_write(phydev, MII_INTEN, value);

	} else {

		err = phy_write(phydev, MII_INTEN, value);

		if (err)

			return err;



		err = tja11xx_ack_interrupt(phydev);

	}



	return phy_write(phydev, MII_INTEN, value);

	return err;

}



static irqreturn_t tja11xx_handle_interrupt(struct phy_device *phydev)
@@ -768,7 +781,6 @@ static struct phy_driver tja11xx_driver[] = { 
		.get_sset_count = tja11xx_get_sset_count,

		.get_strings	= tja11xx_get_strings,

		.get_stats	= tja11xx_get_stats,

		.ack_interrupt	= tja11xx_ack_interrupt,

		.config_intr	= tja11xx_config_intr,

		.handle_interrupt = tja11xx_handle_interrupt,

		.cable_test_start = tja11xx_cable_test_start,
@@ -792,7 +804,6 @@ static struct phy_driver tja11xx_driver[] = { 
		.get_sset_count = tja11xx_get_sset_count,

		.get_strings	= tja11xx_get_strings,

		.get_stats	= tja11xx_get_stats,

		.ack_interrupt	= tja11xx_ack_interrupt,

		.config_intr	= tja11xx_config_intr,

		.handle_interrupt = tja11xx_handle_interrupt,

		.cable_test_start = tja11xx_cable_test_start,

CRA Git | Maintained and supported by SUSTech CRA and CCSE