Skip to contentSkip to conversation

soc/tegra: pmc: Fix and simplify resource lookup

PATCH Superseded Jon Hunter 1 participant 2 messages May 17, 2024 – Jun 11, 2024 Tegra architecture support

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jon Hunter

author maintainer
#0 lore raw

PATCH 1/1 soc/tegra: pmc: Fix and simplify resource lookup

Commit 6f4429e21a7f ("soc/tegra: pmc: Update address mapping sequence for PMC apertures") updated the resource lookup code in the PMC driver and after this change, the return value from the function platform_get_resource_byname() for 'wake' and 'aotag' regions is no longer checked. Fix this by replacing the calls to platform_get_resource_byname() and devm_ioremap_resource() with devm_platform_ioremap_resource_byname().

Fixes 6f4429e21a7f ("soc/tegra: pmc: Update address mapping sequence for PMC apertures")
---
 drivers/soc/tegra/pmc.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/soc/tegra/pmc.c +2 -6
index 91d0ad6ddefc..6c37d6eb8b49 100644
@@ -2891,15 +2891,11 @@ static int tegra_pmc_probe(struct platform_device *pdev)
 		pmc->aotag = base;
 		pmc->scratch = base;
 	} else {
-		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-						"wake");
-		pmc->wake = devm_ioremap_resource(&pdev->dev, res);
+		pmc->wake = devm_platform_ioremap_resource_byname(pdev, "wake");
 		if (IS_ERR(pmc->wake))
 			return PTR_ERR(pmc->wake);
 
-		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-						"aotag");
-		pmc->aotag = devm_ioremap_resource(&pdev->dev, res);
+		pmc->aotag = devm_platform_ioremap_resource_byname(pdev, "aotag");
 		if (IS_ERR(pmc->aotag))
 			return PTR_ERR(pmc->aotag);
 
Signature · 1 line
2.34.1
author maintainer
#1 lore raw
Quoted 26 lines · Jon Hunter

Commit 6f4429e21a7f ("soc/tegra: pmc: Update address mapping sequence for PMC apertures") updated the resource lookup code in the PMC driver and after this change, the return value from the function platform_get_resource_byname() for 'wake' and 'aotag' regions is no longer checked. Fix this by replacing the calls to platform_get_resource_byname() and devm_ioremap_resource() with devm_platform_ioremap_resource_byname().

Fixes 6f4429e21a7f ("soc/tegra: pmc: Update address mapping sequence for PMC apertures")
---
  drivers/soc/tegra/pmc.c | 8 ++------
  1 file changed, 2 insertions(+), 6 deletions(-)
drivers/soc/tegra/pmc.c +1 -3
index 91d0ad6ddefc..6c37d6eb8b49 100644
@@ -2891,15 +2891,11 @@ static int tegra_pmc_probe(struct platform_device *pdev)
  		pmc->aotag = base;
  		pmc->scratch = base;
  	} else {
-		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-						"wake");
-		pmc->wake = devm_ioremap_resource(&pdev->dev, res);
+		pmc->wake = devm_platform_ioremap_resource_byname(pdev, "wake");

drivers/soc/tegra/pmc.c static int tegra_pmc_probe(struct platform_device *pdev) · line 2901

Quoted 10 lines
drivers/soc/tegra/pmc.c +1 -3
  		if (IS_ERR(pmc->wake))
  			return PTR_ERR(pmc->wake);
 
-		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-						"aotag");
-		pmc->aotag = devm_ioremap_resource(&pdev->dev, res);
+		pmc->aotag = devm_platform_ioremap_resource_byname(pdev, "aotag");
  		if (IS_ERR(pmc->aotag))
  			return PTR_ERR(pmc->aotag);
 

I guess this is no quite accurate, because on further inspection the above code behaves the same as devm_platform_ioremap_resource_byname(). However, we can simplify this code by just using devm_platform_ioremap_resource_byname(). I will resend this and update the commit message.

Jon

Signature · 1 line
nvpublic