net: broadcom: convert to devm_platform_ioremap_resource_byname()
Subsystems (3)
PATCH 1/1 net: broadcom: convert to devm_platform_ioremap_resource_byname()
Use the function devm_platform_ioremap_resource_byname() to simplify source code which calls the functions platform_get_resource_byname() and devm_ioremap_resource(). Remove also a few error messages which became unnecessary with this software refactoring.
Suggested-by Markus Elfring <[email protected]>
Signed-off-by Dejin Zheng <[email protected]>
--- .../net/ethernet/broadcom/bgmac-platform.c | 33 +++++++------------ 1 file changed, 11 insertions(+), 22 deletions(-)
drivers/net/ethernet/broadcom/bgmac-platform.c +11 -22
@@ -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;const u8 *mac_addr; bgmac =bgmac_alloc (&pdev->dev);
@@ -202,31 +201,21 @@ static int bgmac_probe(struct platform_device *pdev)if (bgmac->irq <0 )return bgmac->irq; - regs =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"amac_base" ); -if (!regs) { -dev_err (&pdev->dev,"Unable to obtain base resource\n" ); -return -EINVAL ; - } - - bgmac->plat.base =devm_ioremap_resource (&pdev->dev, regs); + bgmac->plat.base = +devm_platform_ioremap_resource_byname (pdev,"amac_base" );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->feature_flags &= ~BGMAC_FEAT_IDM_MASK ; - } + 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); + 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;
Signature · 1 line
2.25.0
From: Dejin Zheng <[email protected]>
Date: Mon, 20 Apr 2020 23:06:41 +0800
Quoted 7 lines
Use the function
devm_platform_ioremap_resource_byname()to simplify source code which calls the functionsplatform_get_resource_byname()anddevm_ioremap_resource(). Remove also a few error messages which became unnecessary with this software refactoring.Suggested-by Markus Elfring <[email protected]>Signed-off-by Dejin Zheng <[email protected]>
Applied.