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

diff --combined drivers/thermal/armada_thermal.c
index 7c603b854e87fb3ba6c3fb1f45f5ed34683aa1f9,0d02d4edeecb04bf48936ab8482391959b555a3e,54ffd64ca3f7560a3b9563bf4087c949a32cf2c6,5b4d75fd7b49f3f857e39dacc04488977c3d448b..5e53212b984fd183f329a0fb7f7b48e778199f12
--- 1/drivers/thermal/armada_thermal.c
--- 2/drivers/thermal/armada_thermal.c
--- 3/drivers/thermal/armada_thermal.c
--- 4/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@@@@ -169,21 -169,21 -169,11 -169,21 +169,11 @@@@@ static int armada_thermal_probe(struct 
                return -ENOMEM;
    
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-- -    if (!res) {
-- -            dev_err(&pdev->dev, "Failed to get platform resource\n");
-- -            return -ENODEV;
-- -    }
-- -
        priv->sensor = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(priv->sensor))
                return PTR_ERR(priv->sensor);
    
        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-- -    if (!res) {
-- -            dev_err(&pdev->dev, "Failed to get platform resource\n");
-- -            return -ENODEV;
-- -    }
-- -
        priv->control = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(priv->control))
                return PTR_ERR(priv->control);
@@@@@ -210,7 -210,6 -200,7 -210,7 +200,6 @@@@@ static int armada_thermal_exit(struct p
                platform_get_drvdata(pdev);
    
        thermal_zone_device_unregister(armada_thermal);
- --    platform_set_drvdata(pdev, NULL);
    
        return 0;
    }
@@@@@ -221,7 -220,7 -211,7 -221,7 +210,7 @@@@@ static struct platform_driver armada_th
        .driver = {
                .name = "armada_thermal",
                .owner = THIS_MODULE,
 ---            .of_match_table = of_match_ptr(armada_thermal_id_table),
 +++            .of_match_table = armada_thermal_id_table,
        },
    };
    

diff --combined drivers/thermal/dove_thermal.c
index d5c029f9344df4dc3611065630dfe102761be2ef,900479e69ccb48dda9af8dd62f2d982cae528f33,8bf104d8a649fe91f03351f99640345b47a87c21,4b15a5f270dc71a021bde1b6e96e8656720d45bc..828f5e345c303ef9b15662477dfd01d16c8a96f6
--- 1/drivers/thermal/dove_thermal.c
--- 2/drivers/thermal/dove_thermal.c
--- 3/drivers/thermal/dove_thermal.c
--- 4/drivers/thermal/dove_thermal.c
+++ b/drivers/thermal/dove_thermal.c
@@@@@ -134,25 -134,25 -134,16 -134,25 +134,16 @@@@@ static int dove_thermal_probe(struct pl
        struct resource *res;
        int ret;
    
-- -    res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-- -    if (!res) {
-- -            dev_err(&pdev->dev, "Failed to get platform resource\n");
-- -            return -ENODEV;
-- -    }
-- -
        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
    
++ +    res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        priv->sensor = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(priv->sensor))
                return PTR_ERR(priv->sensor);
    
        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-- -    if (!res) {
-- -            dev_err(&pdev->dev, "Failed to get platform resource\n");
-- -            return -ENODEV;
-- -    }
        priv->control = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(priv->control))
                return PTR_ERR(priv->control);
@@@@@ -182,7 -182,6 -173,7 -182,7 +173,6 @@@@@ static int dove_thermal_exit(struct pla
                platform_get_drvdata(pdev);
    
        thermal_zone_device_unregister(dove_thermal);
- --    platform_set_drvdata(pdev, NULL);
    
        return 0;
    }
@@@@@ -195,7 -194,7 -186,7 -195,7 +185,7 @@@@@ static struct platform_driver dove_ther
        .driver = {
                .name = "dove_thermal",
                .owner = THIS_MODULE,
 ---            .of_match_table = of_match_ptr(dove_thermal_id_table),
 +++            .of_match_table = dove_thermal_id_table,
        },
    };
    

diff --combined drivers/thermal/exynos_thermal.c
index d20ce9e614034ba4077d797b5584cfad4d994727,992ae6e25112b19157fa899c47d80daef3d0c9f2,788b1ddcac6caa11709b0c383bc3d60295bdb8be,d20ce9e614034ba4077d797b5584cfad4d994727..03e4bbc08bf0358028c15958e167462927e6ebaa
--- 1/drivers/thermal/exynos_thermal.c
--- 2/drivers/thermal/exynos_thermal.c
--- 3/drivers/thermal/exynos_thermal.c
--- 4/drivers/thermal/exynos_thermal.c
+++ b/drivers/thermal/exynos_thermal.c
@@@@@ -925,11 -925,11 -925,6 -925,11 +925,6 @@@@@ static int exynos_tmu_probe(struct plat
        INIT_WORK(&data->irq_work, exynos_tmu_work);
    
        data->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-- -    if (!data->mem) {
-- -            dev_err(&pdev->dev, "Failed to get platform resource\n");
-- -            return -ENOENT;
-- -    }
-- -
        data->base = devm_ioremap_resource(&pdev->dev, data->mem);
        if (IS_ERR(data->base))
                return PTR_ERR(data->base);
@@@@@ -1001,7 -1001,6 -996,7 -1001,7 +996,6 @@@@@
    
        return 0;
    err_clk:
- --    platform_set_drvdata(pdev, NULL);
        clk_unprepare(data->clk);
        return ret;
    }
@@@@@ -1016,8 -1015,6 -1011,8 -1016,8 +1010,6 @@@@@ static int exynos_tmu_remove(struct pla
    
        clk_unprepare(data->clk);
    
- --    platform_set_drvdata(pdev, NULL);
- --
        return 0;
    }
    

diff --combined drivers/thermal/kirkwood_thermal.c
index 61bbc2605b0251afc7c44417a044cec14bf5c973,b57a45daf0df92ce4aeead741fe8a32357f3b1ea,9e4d98eef17a7f99952af554fb883aa820357c46,dfeceaffbc03c3f462170d721124ad3b3eac1db9..3b034a0dfc9426ad48018699772fc024163156b6
--- 1/drivers/thermal/kirkwood_thermal.c
--- 2/drivers/thermal/kirkwood_thermal.c
--- 3/drivers/thermal/kirkwood_thermal.c
--- 4/drivers/thermal/kirkwood_thermal.c
+++ b/drivers/thermal/kirkwood_thermal.c
@@@@@ -75,16 -75,16 -75,11 -75,16 +75,11 @@@@@ static int kirkwood_thermal_probe(struc
        struct kirkwood_thermal_priv *priv;
        struct resource *res;
    
-- -    res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-- -    if (!res) {
-- -            dev_err(&pdev->dev, "Failed to get platform resource\n");
-- -            return -ENODEV;
-- -    }
-- -
        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
    
++ +    res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        priv->sensor = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(priv->sensor))
                return PTR_ERR(priv->sensor);
@@@@@ -108,7 -108,6 -103,7 -108,7 +103,6 @@@@@ static int kirkwood_thermal_exit(struc
                platform_get_drvdata(pdev);
    
        thermal_zone_device_unregister(kirkwood_thermal);
- --    platform_set_drvdata(pdev, NULL);
    
        return 0;
    }
@@@@@ -121,7 -120,7 -116,7 -121,7 +115,7 @@@@@ static struct platform_driver kirkwood_
        .driver = {
                .name = "kirkwood_thermal",
                .owner = THIS_MODULE,
 ---            .of_match_table = of_match_ptr(kirkwood_thermal_id_table),
 +++            .of_match_table = kirkwood_thermal_id_table,
        },
    };
    

diff --combined drivers/thermal/rcar_thermal.c
index 3eaca06df61703e9d556752ec0aa59066c093a3f,63c7c13d79f3884b9b5d244c599b1bc1cdb1f9d5,72f50bc0456c6221b55ddff81c450bf595b33b12,8d7edd4c82285f2bce93fd811b013bb4f6a9a54a..88f92e1a99440c7bb3763ff691e3d01d09e2ad25
--- 1/drivers/thermal/rcar_thermal.c
--- 2/drivers/thermal/rcar_thermal.c
--- 3/drivers/thermal/rcar_thermal.c
--- 4/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@@@@ -389,11 -389,11 -389,6 -389,11 +389,6 @@@@@ static int rcar_thermal_probe(struct pl
                 * platform has IRQ support.
                 * Then, drier use common register
                 */
-- -            res = platform_get_resource(pdev, IORESOURCE_MEM, mres++);
-- -            if (!res) {
-- -                    dev_err(dev, "Could not get platform resource\n");
-- -                    return -ENODEV;
-- -            }
    
                ret = devm_request_irq(dev, irq->start, rcar_thermal_irq, 0,
                                       dev_name(dev), common);
@@@@@ -405,6 -405,6 -400,7 -405,6 +400,7 @@@@@
                /*
                 * rcar_has_irq_support() will be enabled
                 */
++ +            res = platform_get_resource(pdev, IORESOURCE_MEM, mres++);
                common->base = devm_ioremap_resource(dev, res);
                if (IS_ERR(common->base))
                        return PTR_ERR(common->base);
@@@@@ -458,7 -458,7 -454,7 -458,7 +454,7 @@@@@
    
        platform_set_drvdata(pdev, common);
    
 ---    dev_info(dev, "%d sensor proved\n", i);
 +++    dev_info(dev, "%d sensor probed\n", i);
    
        return 0;
    
@@@@@ -487,8 -487,6 -483,8 -487,8 +483,6 @@@@@ static int rcar_thermal_remove(struct p
                        rcar_thermal_irq_disable(priv);
        }
    
- --    platform_set_drvdata(pdev, NULL);
- --
        pm_runtime_put_sync(dev);
        pm_runtime_disable(dev);
    

diff --combined drivers/thermal/spear_thermal.c
index 838aff29b9d813de716268b3b5d3c0b2df24d9ca,1a14eaa1bbd7427026bb1d2abc67659060ffa952,0f37c7279c968a80d8042c95a965b69796d30b35,3c5ee5607977c562dca9209d44c1b2627a2b760f..ab79ea4701d9f88df85b693c41f96a7d80faaea8
--- 1/drivers/thermal/spear_thermal.c
--- 2/drivers/thermal/spear_thermal.c
--- 3/drivers/thermal/spear_thermal.c
--- 4/drivers/thermal/spear_thermal.c
+++ b/drivers/thermal/spear_thermal.c
@@@@@ -104,7 -104,7 -104,7 -104,7 +104,7 @@@@@ static int spear_thermal_probe(struct p
        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,11 -112,6 -112,11 +112,6 @@@@@
                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 -124,12 -119,10 -124,12 +119,10 @@@@@
        }
    
        /* 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 -174,6 -167,7 -174,7 +167,6 @@@@@ static int spear_thermal_exit(struct pl
        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);
@@@@@ -198,7 -197,7 -191,7 -198,7 +190,7 @@@@@ static struct platform_driver spear_the
                .name = "spear_thermal",
                .owner = THIS_MODULE,
                .pm = &spear_thermal_pm_ops,
 ---            .of_match_table = of_match_ptr(spear_thermal_id_table),
 +++            .of_match_table = spear_thermal_id_table,
        },
    };