mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
net: phy: cicada: 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. Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
e5d2b0b6c2
commit
a758087f47
1 changed files with 11 additions and 4 deletions
|
@ -87,11 +87,20 @@ static int cis820x_config_intr(struct phy_device *phydev)
|
|||
{
|
||||
int err;
|
||||
|
||||
if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
|
||||
if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
|
||||
err = cis820x_ack_interrupt(phydev);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = phy_write(phydev, MII_CIS8201_IMASK,
|
||||
MII_CIS8201_IMASK_MASK);
|
||||
else
|
||||
} else {
|
||||
err = phy_write(phydev, MII_CIS8201_IMASK, 0);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = cis820x_ack_interrupt(phydev);
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
@ -122,7 +131,6 @@ static struct phy_driver cis820x_driver[] = {
|
|||
.phy_id_mask = 0x000ffff0,
|
||||
/* PHY_GBIT_FEATURES */
|
||||
.config_init = &cis820x_config_init,
|
||||
.ack_interrupt = &cis820x_ack_interrupt,
|
||||
.config_intr = &cis820x_config_intr,
|
||||
.handle_interrupt = &cis820x_handle_interrupt,
|
||||
}, {
|
||||
|
@ -131,7 +139,6 @@ static struct phy_driver cis820x_driver[] = {
|
|||
.phy_id_mask = 0x000fffc0,
|
||||
/* PHY_GBIT_FEATURES */
|
||||
.config_init = &cis820x_config_init,
|
||||
.ack_interrupt = &cis820x_ack_interrupt,
|
||||
.config_intr = &cis820x_config_intr,
|
||||
.handle_interrupt = &cis820x_handle_interrupt,
|
||||
} };
|
||||
|
|
Loading…
Reference in a new issue