Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <yangyingliang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Yang Yingliang and committed by
David S. Miller
35cba15a 7f553ff2

+2 -3
+2 -3
drivers/net/ethernet/moxa/moxart_ether.c
··· 481 481 priv->ndev = ndev; 482 482 priv->pdev = pdev; 483 483 484 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 485 - ndev->base_addr = res->start; 486 - priv->base = devm_ioremap_resource(p_dev, res); 484 + priv->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); 487 485 if (IS_ERR(priv->base)) { 488 486 ret = PTR_ERR(priv->base); 489 487 goto init_fail; 490 488 } 489 + ndev->base_addr = res->start; 491 490 492 491 spin_lock_init(&priv->txlock); 493 492