| Message ID | 20191106155449.107672-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | eb34e98baf4ce269423948dacefea6747e963b48 |
| Headers | show |
| Series | [net-next] net: axienet: Fix error return code in axienet_probe() | expand |
> -----Original Message----- > From: Wei Yongjun <weiyongjun1@huawei.com> > Sent: Wednesday, November 6, 2019 9:25 PM > To: Radhey Shyam Pandey <radheys@xilinx.com>; Michal Simek > <michals@xilinx.com>; Russell King <linux@armlinux.org.uk>; Robert Hancock > <hancock@sedsystems.ca> > Cc: Wei Yongjun <weiyongjun1@huawei.com>; netdev@vger.kernel.org; linux- > arm-kernel@lists.infradead.org; kernel-janitors@vger.kernel.org > Subject: [PATCH net-next] net: axienet: Fix error return code in axienet_probe() > > In the DMA memory resource get failed case, the error is not > set and 0 will be returned. Fix it by reove redundant check :s/reove/removing > 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> The rest looks fine. Reviewed-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> > --- > 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 867726d696e2..8f32db6d2c45 100644 > --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > @@ -1788,10 +1788,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); > >
From: Wei Yongjun <weiyongjun1@huawei.com> Date: Wed, 6 Nov 2019 15:54:49 +0000 > In the DMA memory resource get failed case, the error is not > set and 0 will be returned. Fix it by reove 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> Fixed with the commit message typo fixed.
From: David Miller <davem@davemloft.net> Date: Wed, 06 Nov 2019 21:24:41 -0800 (PST) > From: Wei Yongjun <weiyongjun1@huawei.com> > Date: Wed, 6 Nov 2019 15:54:49 +0000 > >> In the DMA memory resource get failed case, the error is not >> set and 0 will be returned. Fix it by reove 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> > > Fixed with the commit message typo fixed. I meant "Applied with the commit message typo fixed." :-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index 867726d696e2..8f32db6d2c45 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -1788,10 +1788,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);
In the DMA memory resource get failed case, the error is not set and 0 will be returned. Fix it by reove 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> --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 ---- 1 file changed, 4 deletions(-)