Unverified Commit a4dd55f8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-6.11-soc' of... 

Merge tag 'tegra-for-6.11-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/drivers

soc/tegra: Changes for v6.11-rc1

This is a simple change that condenses two function calls into one in
two places to save some boilerplate.

* tag 'tegra-for-6.11-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: pmc: Simplify resource lookup

Link: https://lore.kernel.org/r/20240628210818.3627404-1-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 276d7eab cfcd6c46

drivers/soc/tegra/pmc.c

+2 −6
Original line number Diff line number Diff line
@@ -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);