lkml.org 
[lkml]   [2020]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v2 14/19] net: phy: cicada: remove the use of .ack_interrupt()
    Date
    From: Ioana Ciornei <ioana.ciornei@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.

    Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
    ---
    Changes in v2:
    - none

    drivers/net/phy/cicada.c | 15 +++++++++++----
    1 file changed, 11 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/phy/cicada.c b/drivers/net/phy/cicada.c
    index 086c62ff5293..ef5f412e101f 100644
    --- a/drivers/net/phy/cicada.c
    +++ b/drivers/net/phy/cicada.c
    @@ -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,
    } };
    --
    2.28.0
    \
     
     \ /
      Last update: 2020-11-01 13:54    [W:3.897 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site