cpufreq: brcmstb-avs-cpufreq: Free resources in error path

If 'cpufreq_register_driver()' fails, we must release the resources
allocated in 'brcm_avs_prepare_init()' as already done in the remove
function.

To do that, introduce a new function 'brcm_avs_prepare_uninit()' in order
to avoid code duplication. This also makes the code more readable (IMHO).

Fixes: de322e085995 ("cpufreq: brcmstb-avs-cpufreq: AVS CPUfreq driver for Broadcom STB SoCs")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
[ Viresh: Updated Subject ]
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c
index 3e31e5d28b79ca19714f6993e7ccc6caf10858c6..e25ccb744187d6b1716dbdb2c48e88d9a6c3386e 100644 (file)
--- a/drivers/cpufreq/brcmstb-avs-cpufreq.c
+++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c
@@ -597,6 +597,16 @@ unmap_base:
        return ret;
 }
 
+static void brcm_avs_prepare_uninit(struct platform_device *pdev)
+{
+       struct private_data *priv;
+
+       priv = platform_get_drvdata(pdev);
+
+       iounmap(priv->avs_intr_base);
+       iounmap(priv->base);
+}
+
 static int brcm_avs_cpufreq_init(struct cpufreq_policy *policy)
 {
        struct cpufreq_frequency_table *freq_table;
@@ -732,21 +742,22 @@ static int brcm_avs_cpufreq_probe(struct platform_device *pdev)
 
        brcm_avs_driver.driver_data = pdev;
 
-       return cpufreq_register_driver(&brcm_avs_driver);
+       ret = cpufreq_register_driver(&brcm_avs_driver);
+       if (ret)
+               brcm_avs_prepare_uninit(pdev);
+
+       return ret;
 }
 
 static int brcm_avs_cpufreq_remove(struct platform_device *pdev)
 {
-       struct private_data *priv;
        int ret;
 
        ret = cpufreq_unregister_driver(&brcm_avs_driver);
        if (ret)
                return ret;
 
-       priv = platform_get_drvdata(pdev);
-       iounmap(priv->base);
-       iounmap(priv->avs_intr_base);
+       brcm_avs_prepare_uninit(pdev);
 
        return 0;
 }