lkml.org 
[lkml]   [2021]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 069/242] net: moxa: Use devm_platform_get_and_ioremap_resource()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit 35cba15a504bf4f585bb9d78f47b22b28a1a06b2 ]

    Use devm_platform_get_and_ioremap_resource() to simplify
    code and avoid a null-ptr-deref by checking 'res' in it.

    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/moxa/moxart_ether.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c
    index 49fd843c4c8a..a4380c45f668 100644
    --- a/drivers/net/ethernet/moxa/moxart_ether.c
    +++ b/drivers/net/ethernet/moxa/moxart_ether.c
    @@ -481,14 +481,13 @@ static int moxart_mac_probe(struct platform_device *pdev)
    priv->ndev = ndev;
    priv->pdev = pdev;

    - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    - ndev->base_addr = res->start;
    - priv->base = devm_ioremap_resource(p_dev, res);
    + priv->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
    if (IS_ERR(priv->base)) {
    dev_err(p_dev, "devm_ioremap_resource failed\n");
    ret = PTR_ERR(priv->base);
    goto init_fail;
    }
    + ndev->base_addr = res->start;

    spin_lock_init(&priv->txlock);

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-15 21:10    [W:4.041 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site