* [PATCH net-next] net: dsa: gswip: Fix return value check in gswip_probe()
@ 2018-09-15 1:33 Wei Yongjun
2018-09-15 9:14 ` Hauke Mehrtens
2018-09-17 15:07 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Wei Yongjun @ 2018-09-15 1:33 UTC (permalink / raw)
To: Andrew Lunn, Vivien Didelot, Florian Fainelli, Hauke Mehrtens
Cc: Wei Yongjun, netdev, kernel-janitors
In case of error, the function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().
Fixes: 14fceff4771e ("net: dsa: Add Lantiq / Intel DSA driver for vrx200")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/net/dsa/lantiq_gswip.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c
index 9c28d0b..faac359 100644
--- a/drivers/net/dsa/lantiq_gswip.c
+++ b/drivers/net/dsa/lantiq_gswip.c
@@ -1044,18 +1044,18 @@ static int gswip_probe(struct platform_device *pdev)
gswip_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
priv->gswip = devm_ioremap_resource(dev, gswip_res);
- if (!priv->gswip)
- return -ENOMEM;
+ if (IS_ERR(priv->gswip))
+ return PTR_ERR(priv->gswip);
mdio_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
priv->mdio = devm_ioremap_resource(dev, mdio_res);
- if (!priv->mdio)
- return -ENOMEM;
+ if (IS_ERR(priv->mdio))
+ return PTR_ERR(priv->mdio);
mii_res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
priv->mii = devm_ioremap_resource(dev, mii_res);
- if (!priv->mii)
- return -ENOMEM;
+ if (IS_ERR(priv->mii))
+ return PTR_ERR(priv->mii);
priv->hw_info = of_device_get_match_data(dev);
if (!priv->hw_info)
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: dsa: gswip: Fix return value check in gswip_probe()
2018-09-15 1:33 [PATCH net-next] net: dsa: gswip: Fix return value check in gswip_probe() Wei Yongjun
@ 2018-09-15 9:14 ` Hauke Mehrtens
2018-09-17 15:07 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Hauke Mehrtens @ 2018-09-15 9:14 UTC (permalink / raw)
To: Wei Yongjun, Andrew Lunn, Vivien Didelot, Florian Fainelli
Cc: netdev, kernel-janitors
[-- Attachment #1.1: Type: text/plain, Size: 1585 bytes --]
On 09/15/2018 03:33 AM, Wei Yongjun wrote:
> In case of error, the function devm_ioremap_resource() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value check should
> be replaced with IS_ERR().
>
> Fixes: 14fceff4771e ("net: dsa: Add Lantiq / Intel DSA driver for vrx200")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
> drivers/net/dsa/lantiq_gswip.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c
> index 9c28d0b..faac359 100644
> --- a/drivers/net/dsa/lantiq_gswip.c
> +++ b/drivers/net/dsa/lantiq_gswip.c
> @@ -1044,18 +1044,18 @@ static int gswip_probe(struct platform_device *pdev)
>
> gswip_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> priv->gswip = devm_ioremap_resource(dev, gswip_res);
> - if (!priv->gswip)
> - return -ENOMEM;
> + if (IS_ERR(priv->gswip))
> + return PTR_ERR(priv->gswip);
>
> mdio_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> priv->mdio = devm_ioremap_resource(dev, mdio_res);
> - if (!priv->mdio)
> - return -ENOMEM;
> + if (IS_ERR(priv->mdio))
> + return PTR_ERR(priv->mdio);
>
> mii_res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
> priv->mii = devm_ioremap_resource(dev, mii_res);
> - if (!priv->mii)
> - return -ENOMEM;
> + if (IS_ERR(priv->mii))
> + return PTR_ERR(priv->mii);
>
> priv->hw_info = of_device_get_match_data(dev);
> if (!priv->hw_info)
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: dsa: gswip: Fix return value check in gswip_probe()
2018-09-15 1:33 [PATCH net-next] net: dsa: gswip: Fix return value check in gswip_probe() Wei Yongjun
2018-09-15 9:14 ` Hauke Mehrtens
@ 2018-09-17 15:07 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2018-09-17 15:07 UTC (permalink / raw)
To: weiyongjun1
Cc: andrew, vivien.didelot, f.fainelli, hauke, netdev,
kernel-janitors
From: Wei Yongjun <weiyongjun1@huawei.com>
Date: Sat, 15 Sep 2018 01:33:21 +0000
> In case of error, the function devm_ioremap_resource() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value check should
> be replaced with IS_ERR().
>
> Fixes: 14fceff4771e ("net: dsa: Add Lantiq / Intel DSA driver for vrx200")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-17 20:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-15 1:33 [PATCH net-next] net: dsa: gswip: Fix return value check in gswip_probe() Wei Yongjun
2018-09-15 9:14 ` Hauke Mehrtens
2018-09-17 15:07 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox