thermal/drivers/tegra: Use devm_platform_ioremap_resource_byname

[linux-2.6-microblaze.git] / drivers / thermal / tegra / soctherm.c

diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/soctherm.c
index 66e0639..8e303e9 100644 (file)
--- a/drivers/thermal/tegra/soctherm.c
+++ b/drivers/thermal/tegra/soctherm.c
@@ -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);
@@ -2195,7 +2188,7 @@ static int tegra_soctherm_probe(struct platform_device *pdev)
        if (err)
                return err;
 
-       /* calculate tsensor calibaration data */
+       /* calculate tsensor calibration data */
        for (i = 0; i < soc->num_tsensors; ++i) {
                err = tegra_calc_tsensor_calib(&soc->tsensors[i],
                                               &shared_calib,