Merge tag 'pwm/for-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[linux-2.6-microblaze.git] / drivers / net / ethernet / broadcom / bgmac-platform.c

diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c
index 9834b77..4ab5bf6 100644 (file)
--- a/drivers/net/ethernet/broadcom/bgmac-platform.c
+++ b/drivers/net/ethernet/broadcom/bgmac-platform.c
@@ -172,7 +172,6 @@ static int bgmac_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
        struct bgmac *bgmac;
-       struct resource *regs;
        int ret;
 
        bgmac = bgmac_alloc(&pdev->dev);
@@ -206,21 +205,15 @@ static int bgmac_probe(struct platform_device *pdev)
        if (IS_ERR(bgmac->plat.base))
                return PTR_ERR(bgmac->plat.base);
 
-       regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "idm_base");
-       if (regs) {
-               bgmac->plat.idm_base = devm_ioremap_resource(&pdev->dev, regs);
-               if (IS_ERR(bgmac->plat.idm_base))
-                       return PTR_ERR(bgmac->plat.idm_base);
+       bgmac->plat.idm_base = devm_platform_ioremap_resource_byname(pdev, "idm_base");
+       if (IS_ERR(bgmac->plat.idm_base))
+               return PTR_ERR(bgmac->plat.idm_base);
+       else
                bgmac->feature_flags &= ~BGMAC_FEAT_IDM_MASK;
-       }
 
-       regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nicpm_base");
-       if (regs) {
-               bgmac->plat.nicpm_base = devm_ioremap_resource(&pdev->dev,
-                                                              regs);
-               if (IS_ERR(bgmac->plat.nicpm_base))
-                       return PTR_ERR(bgmac->plat.nicpm_base);
-       }
+       bgmac->plat.nicpm_base = devm_platform_ioremap_resource_byname(pdev, "nicpm_base");
+       if (IS_ERR(bgmac->plat.nicpm_base))
+               return PTR_ERR(bgmac->plat.nicpm_base);
 
        bgmac->read = platform_bgmac_read;
        bgmac->write = platform_bgmac_write;