diff options
| author | Yang Yingliang <[email protected]> | 2021-06-07 15:02:59 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2021-06-07 21:08:30 +0000 |
| commit | 35cba15a504bf4f585bb9d78f47b22b28a1a06b2 (patch) | |
| tree | cb81223c3fcba6757d508cca7b8b588c5c99d00c /drivers/net/ethernet/moxa/moxart_ether.c | |
| parent | l2tp: Fix spelling mistakes (diff) | |
| download | kernel-35cba15a504bf4f585bb9d78f47b22b28a1a06b2.tar.gz kernel-35cba15a504bf4f585bb9d78f47b22b28a1a06b2.zip | |
net: moxa: Use devm_platform_get_and_ioremap_resource()
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/moxa/moxart_ether.c')
| -rw-r--r-- | drivers/net/ethernet/moxa/moxart_ether.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index b85733942053..5249b64f4fc5 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c @@ -481,13 +481,12 @@ 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)) { ret = PTR_ERR(priv->base); goto init_fail; } + ndev->base_addr = res->start; spin_lock_init(&priv->txlock); |