cpufreq: tegra20: Use resource-managed API

Switch cpufreq-tegra20 driver to use resource-managed API.
This removes the need to get opp_table pointer using
dev_pm_opp_get_opp_table() in order to release OPP table that
was requested by dev_pm_opp_set_supported_hw(), making the code
a bit more straightforward.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/cpufreq/tegra20-cpufreq.c b/drivers/cpufreq/tegra20-cpufreq.c
index 8c893043953e46f4b8380612433f2ee49d6ba11f..e8db3d75be2517774a123b21ad5c0ed19d946050 100644 (file)
--- a/drivers/cpufreq/tegra20-cpufreq.c
+++ b/drivers/cpufreq/tegra20-cpufreq.c
@@ -32,6 +32,16 @@ static bool cpu0_node_has_opp_v2_prop(void)
        return ret;
 }
 
+static void tegra20_cpufreq_put_supported_hw(void *opp_table)
+{
+       dev_pm_opp_put_supported_hw(opp_table);
+}
+
+static void tegra20_cpufreq_dt_unregister(void *cpufreq_dt)
+{
+       platform_device_unregister(cpufreq_dt);
+}
+
 static int tegra20_cpufreq_probe(struct platform_device *pdev)
 {
        struct platform_device *cpufreq_dt;
@@ -68,42 +78,31 @@ static int tegra20_cpufreq_probe(struct platform_device *pdev)
                return err;
        }
 
+       err = devm_add_action_or_reset(&pdev->dev,
+                                      tegra20_cpufreq_put_supported_hw,
+                                      opp_table);
+       if (err)
+               return err;
+
        cpufreq_dt = platform_device_register_simple("cpufreq-dt", -1, NULL, 0);
        err = PTR_ERR_OR_ZERO(cpufreq_dt);
        if (err) {
                dev_err(&pdev->dev,
                        "failed to create cpufreq-dt device: %d\n", err);
-               goto err_put_supported_hw;
+               return err;
        }
 
-       platform_set_drvdata(pdev, cpufreq_dt);
-
-       return 0;
-
-err_put_supported_hw:
-       dev_pm_opp_put_supported_hw(opp_table);
-
-       return err;
-}
-
-static int tegra20_cpufreq_remove(struct platform_device *pdev)
-{
-       struct platform_device *cpufreq_dt;
-       struct opp_table *opp_table;
-
-       cpufreq_dt = platform_get_drvdata(pdev);
-       platform_device_unregister(cpufreq_dt);
-
-       opp_table = dev_pm_opp_get_opp_table(get_cpu_device(0));
-       dev_pm_opp_put_supported_hw(opp_table);
-       dev_pm_opp_put_opp_table(opp_table);
+       err = devm_add_action_or_reset(&pdev->dev,
+                                      tegra20_cpufreq_dt_unregister,
+                                      cpufreq_dt);
+       if (err)
+               return err;
 
        return 0;
 }
 
 static struct platform_driver tegra20_cpufreq_driver = {
        .probe          = tegra20_cpufreq_probe,
-       .remove         = tegra20_cpufreq_remove,
        .driver         = {
                .name   = "tegra20-cpufreq",
        },