lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 207/639] mdio_bus: Fix PTR_ERR() usage after initialization to constant
    Date
    From: YueHaibing <yuehaibing@huawei.com>

    [ Upstream commit 780feae7eb69388c8d8b661cda6706b0dc0f642b ]

    Fix coccinelle warning:

    ./drivers/net/phy/mdio_bus.c:51:5-12: ERROR: PTR_ERR applied after initialization to constant on line 44
    ./drivers/net/phy/mdio_bus.c:52:5-12: ERROR: PTR_ERR applied after initialization to constant on line 44

    fix this by using IS_ERR before PTR_ERR

    Fixes: bafbdd527d56 ("phylib: Add device reset GPIO support")
    Signed-off-by: YueHaibing <yuehaibing@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/phy/mdio_bus.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
    index c5588d4508f97..5c89a310359de 100644
    --- a/drivers/net/phy/mdio_bus.c
    +++ b/drivers/net/phy/mdio_bus.c
    @@ -56,11 +56,12 @@ static int mdiobus_register_gpiod(struct mdio_device *mdiodev)
    gpiod = fwnode_get_named_gpiod(&mdiodev->dev.of_node->fwnode,
    "reset-gpios", 0, GPIOD_OUT_LOW,
    "PHY reset");
    - if (PTR_ERR(gpiod) == -ENOENT ||
    - PTR_ERR(gpiod) == -ENOSYS)
    - gpiod = NULL;
    - else if (IS_ERR(gpiod))
    - return PTR_ERR(gpiod);
    + if (IS_ERR(gpiod)) {
    + if (PTR_ERR(gpiod) == -ENOENT || PTR_ERR(gpiod) == -ENOSYS)
    + gpiod = NULL;
    + else
    + return PTR_ERR(gpiod);
    + }

    mdiodev->reset = gpiod;

    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:43    [W:2.156 / U:0.420 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site