Commit fc88f7ad authored by dingsenjie's avatar dingsenjie Committed by Daniel Lezcano
Browse files

thermal/drivers/tegra: Use devm_platform_ioremap_resource_byname 



Use the devm_platform_ioremap_resource_byname() helper instead of
calling platform_get_resource_byname() and devm_ioremap_resource()
separately.

Signed-off-by: default avatardingsenjie <dingsenjie@yulong.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210414063943.96244-1-dingsenjie@163.com
parent beaa4102

drivers/thermal/tegra/soctherm.c

+3 −10
Original line number Diff line number Diff line
@@ -2118,7 +2118,6 @@ static int tegra_soctherm_probe(struct platform_device *pdev) 
	struct tegra_soctherm *tegra;

	struct thermal_zone_device *z;

	struct tsensor_shared_calib shared_calib;

	struct resource *res;

	struct tegra_soctherm_soc *soc;

	unsigned int i;

	int err;
@@ -2140,26 +2139,20 @@ static int tegra_soctherm_probe(struct platform_device *pdev) 


	tegra->soc = soc;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

					   "soctherm-reg");

	tegra->regs = devm_ioremap_resource(&pdev->dev, res);

	tegra->regs = devm_platform_ioremap_resource_byname(pdev, "soctherm-reg");

	if (IS_ERR(tegra->regs)) {

		dev_err(&pdev->dev, "can't get soctherm registers");

		return PTR_ERR(tegra->regs);

	}



	if (!tegra->soc->use_ccroc) {

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

						   "car-reg");

		tegra->clk_regs = devm_ioremap_resource(&pdev->dev, res);

		tegra->clk_regs = devm_platform_ioremap_resource_byname(pdev, "car-reg");

		if (IS_ERR(tegra->clk_regs)) {

			dev_err(&pdev->dev, "can't get car clk registers");

			return PTR_ERR(tegra->clk_regs);

		}

	} else {

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

						   "ccroc-reg");

		tegra->ccroc_regs = devm_ioremap_resource(&pdev->dev, res);

		tegra->ccroc_regs = devm_platform_ioremap_resource_byname(pdev, "ccroc-reg");

		if (IS_ERR(tegra->ccroc_regs)) {

			dev_err(&pdev->dev, "can't get ccroc registers");

			return PTR_ERR(tegra->ccroc_regs);