Merge branches 'misc', 'drv_cleanup', 'devm-cleanup' and 'ti-soc' of .git into next

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / thermal / spear_thermal.c

diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c
index 838aff2..ab79ea4 100644 (file)
--- a/drivers/thermal/spear_thermal.c
+++ b/drivers/thermal/spear_thermal.c
@@ -104,7 +104,7 @@ static int spear_thermal_probe(struct platform_device *pdev)
        struct thermal_zone_device *spear_thermal = NULL;
        struct spear_thermal_dev *stdev;
        struct device_node *np = pdev->dev.of_node;
-       struct resource *stres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       struct resource *res;
        int ret = 0, val;
 
        if (!np || !of_property_read_u32(np, "st,thermal-flags", &val)) {
@@ -112,11 +112,6 @@ static int spear_thermal_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       if (!stres) {
-               dev_err(&pdev->dev, "memory resource missing\n");
-               return -ENODEV;
-       }
-
        stdev = devm_kzalloc(&pdev->dev, sizeof(*stdev), GFP_KERNEL);
        if (!stdev) {
                dev_err(&pdev->dev, "kzalloc fail\n");
@@ -124,12 +119,10 @@ static int spear_thermal_probe(struct platform_device *pdev)
        }
 
        /* Enable thermal sensor */
-       stdev->thermal_base = devm_ioremap(&pdev->dev, stres->start,
-                       resource_size(stres));
-       if (!stdev->thermal_base) {
-               dev_err(&pdev->dev, "ioremap failed\n");
-               return -ENOMEM;
-       }
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       stdev->thermal_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(stdev->thermal_base))
+               return PTR_ERR(stdev->thermal_base);
 
        stdev->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(stdev->clk)) {
@@ -174,7 +167,6 @@ static int spear_thermal_exit(struct platform_device *pdev)
        struct spear_thermal_dev *stdev = spear_thermal->devdata;
 
        thermal_zone_device_unregister(spear_thermal);
-       platform_set_drvdata(pdev, NULL);
 
        /* Disable SPEAr Thermal Sensor */
        actual_mask = readl_relaxed(stdev->thermal_base);