Commit a3417885 authored by Ioana Ciornei's avatar Ioana Ciornei Committed by Jakub Kicinski

net: phy: at803x: 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: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: Michael Walle <michael@walle.cc>
Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Tested-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 29773097
...@@ -614,6 +614,11 @@ static int at803x_config_intr(struct phy_device *phydev) ...@@ -614,6 +614,11 @@ static int at803x_config_intr(struct phy_device *phydev)
value = phy_read(phydev, AT803X_INTR_ENABLE); value = phy_read(phydev, AT803X_INTR_ENABLE);
if (phydev->interrupts == PHY_INTERRUPT_ENABLED) { if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
/* Clear any pending interrupts */
err = at803x_ack_interrupt(phydev);
if (err)
return err;
value |= AT803X_INTR_ENABLE_AUTONEG_ERR; value |= AT803X_INTR_ENABLE_AUTONEG_ERR;
value |= AT803X_INTR_ENABLE_SPEED_CHANGED; value |= AT803X_INTR_ENABLE_SPEED_CHANGED;
value |= AT803X_INTR_ENABLE_DUPLEX_CHANGED; value |= AT803X_INTR_ENABLE_DUPLEX_CHANGED;
...@@ -621,9 +626,14 @@ static int at803x_config_intr(struct phy_device *phydev) ...@@ -621,9 +626,14 @@ static int at803x_config_intr(struct phy_device *phydev)
value |= AT803X_INTR_ENABLE_LINK_SUCCESS; value |= AT803X_INTR_ENABLE_LINK_SUCCESS;
err = phy_write(phydev, AT803X_INTR_ENABLE, value); err = phy_write(phydev, AT803X_INTR_ENABLE, value);
} } else {
else
err = phy_write(phydev, AT803X_INTR_ENABLE, 0); err = phy_write(phydev, AT803X_INTR_ENABLE, 0);
if (err)
return err;
/* Clear any pending interrupts */
err = at803x_ack_interrupt(phydev);
}
return err; return err;
} }
...@@ -1088,7 +1098,6 @@ static struct phy_driver at803x_driver[] = { ...@@ -1088,7 +1098,6 @@ static struct phy_driver at803x_driver[] = {
.resume = at803x_resume, .resume = at803x_resume,
/* PHY_GBIT_FEATURES */ /* PHY_GBIT_FEATURES */
.read_status = at803x_read_status, .read_status = at803x_read_status,
.ack_interrupt = at803x_ack_interrupt,
.config_intr = at803x_config_intr, .config_intr = at803x_config_intr,
.handle_interrupt = at803x_handle_interrupt, .handle_interrupt = at803x_handle_interrupt,
.get_tunable = at803x_get_tunable, .get_tunable = at803x_get_tunable,
...@@ -1109,7 +1118,6 @@ static struct phy_driver at803x_driver[] = { ...@@ -1109,7 +1118,6 @@ static struct phy_driver at803x_driver[] = {
.suspend = at803x_suspend, .suspend = at803x_suspend,
.resume = at803x_resume, .resume = at803x_resume,
/* PHY_BASIC_FEATURES */ /* PHY_BASIC_FEATURES */
.ack_interrupt = at803x_ack_interrupt,
.config_intr = at803x_config_intr, .config_intr = at803x_config_intr,
.handle_interrupt = at803x_handle_interrupt, .handle_interrupt = at803x_handle_interrupt,
}, { }, {
...@@ -1128,7 +1136,6 @@ static struct phy_driver at803x_driver[] = { ...@@ -1128,7 +1136,6 @@ static struct phy_driver at803x_driver[] = {
/* PHY_GBIT_FEATURES */ /* PHY_GBIT_FEATURES */
.read_status = at803x_read_status, .read_status = at803x_read_status,
.aneg_done = at803x_aneg_done, .aneg_done = at803x_aneg_done,
.ack_interrupt = &at803x_ack_interrupt,
.config_intr = &at803x_config_intr, .config_intr = &at803x_config_intr,
.handle_interrupt = at803x_handle_interrupt, .handle_interrupt = at803x_handle_interrupt,
.get_tunable = at803x_get_tunable, .get_tunable = at803x_get_tunable,
...@@ -1149,7 +1156,6 @@ static struct phy_driver at803x_driver[] = { ...@@ -1149,7 +1156,6 @@ static struct phy_driver at803x_driver[] = {
.suspend = at803x_suspend, .suspend = at803x_suspend,
.resume = at803x_resume, .resume = at803x_resume,
/* PHY_BASIC_FEATURES */ /* PHY_BASIC_FEATURES */
.ack_interrupt = at803x_ack_interrupt,
.config_intr = at803x_config_intr, .config_intr = at803x_config_intr,
.handle_interrupt = at803x_handle_interrupt, .handle_interrupt = at803x_handle_interrupt,
.cable_test_start = at803x_cable_test_start, .cable_test_start = at803x_cable_test_start,
...@@ -1162,7 +1168,6 @@ static struct phy_driver at803x_driver[] = { ...@@ -1162,7 +1168,6 @@ static struct phy_driver at803x_driver[] = {
.resume = at803x_resume, .resume = at803x_resume,
.flags = PHY_POLL_CABLE_TEST, .flags = PHY_POLL_CABLE_TEST,
/* PHY_BASIC_FEATURES */ /* PHY_BASIC_FEATURES */
.ack_interrupt = &at803x_ack_interrupt,
.config_intr = &at803x_config_intr, .config_intr = &at803x_config_intr,
.handle_interrupt = at803x_handle_interrupt, .handle_interrupt = at803x_handle_interrupt,
.cable_test_start = at803x_cable_test_start, .cable_test_start = at803x_cable_test_start,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment