lkml.org 
[lkml]   [2020]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 64/73] net: mvmdio: avoid error message for optional IRQ
    Date
    From: Chris Packham <chris.packham@alliedtelesis.co.nz>

    [ Upstream commit e1f550dc44a4d535da4e25ada1b0eaf8f3417929 ]

    Per the dt-binding the interrupt is optional so use
    platform_get_irq_optional() instead of platform_get_irq(). Since
    commit 7723f4c5ecdb ("driver core: platform: Add an error message to
    platform_get_irq*()") platform_get_irq() produces an error message

    orion-mdio f1072004.mdio: IRQ index 0 not found

    which is perfectly normal if one hasn't specified the optional property
    in the device tree.

    Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
    Reviewed-by: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/marvell/mvmdio.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c
    index 0b9e851f3da4f..d2e2dc5384287 100644
    --- a/drivers/net/ethernet/marvell/mvmdio.c
    +++ b/drivers/net/ethernet/marvell/mvmdio.c
    @@ -347,7 +347,7 @@ static int orion_mdio_probe(struct platform_device *pdev)
    }


    - dev->err_interrupt = platform_get_irq(pdev, 0);
    + dev->err_interrupt = platform_get_irq_optional(pdev, 0);
    if (dev->err_interrupt > 0 &&
    resource_size(r) < MVMDIO_ERR_INT_MASK + 4) {
    dev_err(&pdev->dev,
    @@ -364,8 +364,8 @@ static int orion_mdio_probe(struct platform_device *pdev)
    writel(MVMDIO_ERR_INT_SMI_DONE,
    dev->regs + MVMDIO_ERR_INT_MASK);

    - } else if (dev->err_interrupt == -EPROBE_DEFER) {
    - ret = -EPROBE_DEFER;
    + } else if (dev->err_interrupt < 0) {
    + ret = dev->err_interrupt;
    goto out_mdio;
    }

    --
    2.20.1
    \
     
     \ /
      Last update: 2020-03-18 22:10    [W:4.248 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site