diff options
| author | Yang Yingliang <yangyingliang@huawei.com> | 2021-06-10 11:17:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-10 22:59:37 +0200 |
| commit | 8a55a73433e763c8aec4a3e8df5c28c821fc44b9 (patch) | |
| tree | 7818282f94d7b14578f2bae45e3c5beeb6dc6a87 | |
| parent | net: stmmac: Fix mixed enum type warning (diff) | |
| download | linux-8a55a73433e763c8aec4a3e8df5c28c821fc44b9.tar.xz linux-8a55a73433e763c8aec4a3e8df5c28c821fc44b9.zip | |
net: mido: mdio-mux-bcm-iproc: 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>
| -rw-r--r-- | drivers/net/mdio/mdio-mux-bcm-iproc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/mdio/mdio-mux-bcm-iproc.c b/drivers/net/mdio/mdio-mux-bcm-iproc.c index 239e88c7a272..014c0baedbd2 100644 --- a/drivers/net/mdio/mdio-mux-bcm-iproc.c +++ b/drivers/net/mdio/mdio-mux-bcm-iproc.c @@ -187,7 +187,9 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) return -ENOMEM; md->dev = &pdev->dev; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + md->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); + if (IS_ERR(md->base)) + return PTR_ERR(md->base); if (res->start & 0xfff) { /* For backward compatibility in case the * base address is specified with an offset. @@ -196,9 +198,6 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) res->start &= ~0xfff; res->end = res->start + MDIO_REG_ADDR_SPACE_SIZE - 1; } - md->base = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(md->base)) - return PTR_ERR(md->base); md->mii_bus = devm_mdiobus_alloc(&pdev->dev); if (!md->mii_bus) { |