Commit 35cba15a authored by Yang Yingliang's avatar Yang Yingliang Committed by David S. Miller

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: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7f553ff2
...@@ -481,13 +481,12 @@ static int moxart_mac_probe(struct platform_device *pdev) ...@@ -481,13 +481,12 @@ static int moxart_mac_probe(struct platform_device *pdev)
priv->ndev = ndev; priv->ndev = ndev;
priv->pdev = pdev; priv->pdev = pdev;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); priv->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
ndev->base_addr = res->start;
priv->base = devm_ioremap_resource(p_dev, res);
if (IS_ERR(priv->base)) { if (IS_ERR(priv->base)) {
ret = PTR_ERR(priv->base); ret = PTR_ERR(priv->base);
goto init_fail; goto init_fail;
} }
ndev->base_addr = res->start;
spin_lock_init(&priv->txlock); spin_lock_init(&priv->txlock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment