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

BugLink: https://bugs.launchpad.net/bugs/1918974
[ Upstream commit 05f456286fd489558c72a4711d22a5612c965685 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>

diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c
index 77b0e5d0fb1344b29c452cb96be05fcefec0d516..1514c9846c5d5580d0cad1994dd19a05f4317f00 100644 (file)
--- a/drivers/cpufreq/brcmstb-avs-cpufreq.c
+++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c
@@ -566,6 +566,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;
@@ -701,21 +711,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;
 }