mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 00:40:03 +00:00
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: Ioana Ciornei <ioana.ciornei@nxp.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
52b1984a88
commit
45f52f1238
1 changed files with 15 additions and 4 deletions
|
@ -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;
|
||||
|
||||
return phy_write(phydev, MII_INTEN, value);
|
||||
err = tja11xx_ack_interrupt(phydev);
|
||||
}
|
||||
|
||||
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,
|
||||
|
|
Loading…
Reference in a new issue