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 5.4 076/102] net: axienet: Fix error return code in axienet_probe()
    Date
    From: Wei Yongjun <weiyongjun1@huawei.com>

    [ Upstream commit eb34e98baf4ce269423948dacefea6747e963b48 ]

    In the DMA memory resource get failed case, the error is not
    set and 0 will be returned. Fix it by removing redundant check
    since devm_ioremap_resource() will handle it.

    Fixes: 28ef9ebdb64c ("net: axienet: make use of axistream-connected attribute optional")
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    Reviewed-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 ----
    1 file changed, 4 deletions(-)

    diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
    index 676006f32f913..479325eeaf8a0 100644
    --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
    +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
    @@ -1790,10 +1790,6 @@ static int axienet_probe(struct platform_device *pdev)
    /* Check for these resources directly on the Ethernet node. */
    struct resource *res = platform_get_resource(pdev,
    IORESOURCE_MEM, 1);
    - if (!res) {
    - dev_err(&pdev->dev, "unable to get DMA memory resource\n");
    - goto free_netdev;
    - }
    lp->dma_regs = devm_ioremap_resource(&pdev->dev, res);
    lp->rx_irq = platform_get_irq(pdev, 1);
    lp->tx_irq = platform_get_irq(pdev, 0);
    --
    2.20.1


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