On Sun, Nov 01, 2020 at 02:51:00PM +0200, Ioana Ciornei wrote:
> From: Ioana Ciornei <ioana.cior...@nxp.com>
>
> 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.rem...@pengutronix.de>
> Cc: Michael Walle <mich...@walle.cc>
> Signed-off-by: Ioana Ciornei <ioana.cior...@nxp.com>
Tested-by: Oleksij Rempel <o.rem...@pengutronix.de>
> ---
> Changes in v2:
> - none
>
> drivers/net/phy/at803x.c | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
> index c7f91934cf82..d0b36fd6c265 100644
> --- a/drivers/net/phy/at803x.c
> +++ b/drivers/net/phy/at803x.c
> @@ -614,6 +614,11 @@ static int at803x_config_intr(struct phy_device *phydev)
> value = phy_read(phydev, AT803X_INTR_ENABLE);
>
> 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_SPEED_CHANGED;
> value |= AT803X_INTR_ENABLE_DUPLEX_CHANGED;
> @@ -621,9 +626,14 @@ static int at803x_config_intr(struct phy_device *phydev)
> value |= AT803X_INTR_ENABLE_LINK_SUCCESS;
>
> err = phy_write(phydev, AT803X_INTR_ENABLE, value);
> - }
> - else
> + } else {
> err = phy_write(phydev, AT803X_INTR_ENABLE, 0);
> + if (err)
> + return err;
> +
> + /* Clear any pending interrupts */
> + err = at803x_ack_interrupt(phydev);
> + }
>
> return err;
> }
> @@ -1088,7 +1098,6 @@ static struct phy_driver at803x_driver[] = {
> .resume = at803x_resume,
> /* PHY_GBIT_FEATURES */
> .read_status = at803x_read_status,
> - .ack_interrupt = at803x_ack_interrupt,
> .config_intr = at803x_config_intr,
> .handle_interrupt = at803x_handle_interrupt,
> .get_tunable = at803x_get_tunable,
> @@ -1109,7 +1118,6 @@ static struct phy_driver at803x_driver[] = {
> .suspend = at803x_suspend,
> .resume = at803x_resume,
> /* PHY_BASIC_FEATURES */
> - .ack_interrupt = at803x_ack_interrupt,
> .config_intr = at803x_config_intr,
> .handle_interrupt = at803x_handle_interrupt,
> }, {
> @@ -1128,7 +1136,6 @@ static struct phy_driver at803x_driver[] = {
> /* PHY_GBIT_FEATURES */
> .read_status = at803x_read_status,
> .aneg_done = at803x_aneg_done,
> - .ack_interrupt = &at803x_ack_interrupt,
> .config_intr = &at803x_config_intr,
> .handle_interrupt = at803x_handle_interrupt,
> .get_tunable = at803x_get_tunable,
> @@ -1149,7 +1156,6 @@ static struct phy_driver at803x_driver[] = {
> .suspend = at803x_suspend,
> .resume = at803x_resume,
> /* PHY_BASIC_FEATURES */
> - .ack_interrupt = at803x_ack_interrupt,
> .config_intr = at803x_config_intr,
> .handle_interrupt = at803x_handle_interrupt,
> .cable_test_start = at803x_cable_test_start,
> @@ -1162,7 +1168,6 @@ static struct phy_driver at803x_driver[] = {
> .resume = at803x_resume,
> .flags = PHY_POLL_CABLE_TEST,
> /* PHY_BASIC_FEATURES */
> - .ack_interrupt = &at803x_ack_interrupt,
> .config_intr = &at803x_config_intr,
> .handle_interrupt = at803x_handle_interrupt,
> .cable_test_start = at803x_cable_test_start,
> --
> 2.28.0
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
