xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: moxa: Use devm_platform_get_and_ioremap_resource()

Browse Source 
[ Upstream commit 35cba15a504bf4f585bb9d78f47b22b28a1a06b2 ]

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 <yangyingliang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yang Yingliang
2021-06-07 23:02:59 +08:00
committed by Greg Kroah-Hartman
parent 278dc34b71
commit 8e4da40142
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ethernet/moxa/moxart_ether.c
View File

@@ -481,14 +481,13 @@ 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)) {
dev_err(p_dev, "devm_ioremap_resource failed\n"); dev_err(p_dev, "devm_ioremap_resource failed\n");
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);