Thermal: spear_thermal: convert to devm_ioremap_resource
authorZhang Rui <rui.zhang@intel.com>
Thu, 16 May 2013 02:16:20 +0000 (02:16 +0000)
committerZhang Rui <rui.zhang@intel.com>
Mon, 20 May 2013 15:36:18 +0000 (23:36 +0800)
Use the newly introduced devm_ioremap_resource().

devm_ioremap_resource() provides its own error messages; so all explicit
error messages can be removed from the failure code paths.

CC: Vincenzo Frascino <vincenzo.frascino@st.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
drivers/thermal/spear_thermal.c

index 3c5ee5607977c562dca9209d44c1b2627a2b760f..b9e21611aece8451b8228e2f51935f8964ea5c00 100644 (file)
@@ -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,23 +112,23 @@ 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");
                return -ENOMEM;
        }
 
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res) {
+               dev_err(&pdev->dev, "memory resource missing\n");
+               return -ENODEV;
+       }
+
        /* Enable thermal sensor */
-       stdev->thermal_base = devm_ioremap(&pdev->dev, stres->start,
-                       resource_size(stres));
-       if (!stdev->thermal_base) {
+       stdev->thermal_base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(stdev->thermal_base)) {
                dev_err(&pdev->dev, "ioremap failed\n");
-               return -ENOMEM;
+               return PTR_ERR(stdev->thermal_base);
        }
 
        stdev->clk = devm_clk_get(&pdev->dev, NULL);