Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[karo-tx-linux.git] / drivers / thermal / exynos_thermal.c

diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c
index 64aa8b445054cc3d24ec1544e6a07b164e5cd00f..e04ebd8671aca27dc390c32d6ec00d6033c7d7ae 100644 (file)
--- a/drivers/thermal/exynos_thermal.c
+++ b/drivers/thermal/exynos_thermal.c
@@ -940,7 +940,7 @@ static inline int create_emulation_sysfs(struct device *dev) { return 0; }
 static inline void remove_emulation_sysfs(struct device *dev) {}
 #endif
 
-static int __devinit exynos_tmu_probe(struct platform_device *pdev)
+static int exynos_tmu_probe(struct platform_device *pdev)
 {
        struct exynos_tmu_data *data;
        struct exynos_tmu_platform_data *pdata = pdev->dev.platform_data;
@@ -974,11 +974,9 @@ static int __devinit exynos_tmu_probe(struct platform_device *pdev)
                return -ENOENT;
        }
 
-       data->base = devm_request_and_ioremap(&pdev->dev, data->mem);
-       if (!data->base) {
-               dev_err(&pdev->dev, "Failed to ioremap memory\n");
-               return -ENODEV;
-       }
+       data->base = devm_ioremap_resource(&pdev->dev, data->mem);
+       if (IS_ERR(data->base))
+               return PTR_ERR(data->base);
 
        ret = devm_request_irq(&pdev->dev, data->irq, exynos_tmu_irq,
                IRQF_TRIGGER_RISING, "exynos-tmu", data);
@@ -1052,7 +1050,7 @@ err_clk:
        return ret;
 }
 
-static int __devexit exynos_tmu_remove(struct platform_device *pdev)
+static int exynos_tmu_remove(struct platform_device *pdev)
 {
        struct exynos_tmu_data *data = platform_get_drvdata(pdev);
 
@@ -1102,7 +1100,7 @@ static struct platform_driver exynos_tmu_driver = {
                .of_match_table = of_match_ptr(exynos_tmu_match),
        },
        .probe = exynos_tmu_probe,
-       .remove = __devexit_p(exynos_tmu_remove),
+       .remove = exynos_tmu_remove,
        .id_table = exynos_tmu_driver_ids,
 };