soc: mediatek: mtk-svs: move svs_platform_probe into probe

Moving svs_platform_probe into driver probe function will allow us to
reduce svs_platform members. This will be done in a follow-up patch.

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Roger Lu <roger.lu@mediatek.com>
Link: https://lore.kernel.org/r/20230111074528.29354-11-roger.lu@mediatek.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

diff --git a/drivers/soc/mediatek/mtk-svs.c b/drivers/soc/mediatek/mtk-svs.c
index 937a416..5c5a30f 100644 (file)
--- a/drivers/soc/mediatek/mtk-svs.c
+++ b/drivers/soc/mediatek/mtk-svs.c
@@ -2353,17 +2353,17 @@ static const struct of_device_id svs_of_match[] = {
        },
 };
 
-static struct svs_platform *svs_platform_probe(struct platform_device *pdev)
+static int svs_probe(struct platform_device *pdev)
 {
        struct svs_platform *svsp;
        const struct svs_platform_data *svsp_data;
-       int ret;
+       int ret, svsp_irq;
 
        svsp_data = of_device_get_match_data(&pdev->dev);
 
        svsp = devm_kzalloc(&pdev->dev, sizeof(*svsp), GFP_KERNEL);
        if (!svsp)
-               return ERR_PTR(-ENOMEM);
+               return -ENOMEM;
 
        svsp->dev = &pdev->dev;
        svsp->name = svsp_data->name;
@@ -2374,19 +2374,7 @@ static struct svs_platform *svs_platform_probe(struct platform_device *pdev)
 
        ret = svsp_data->probe(svsp);
        if (ret)
-               return ERR_PTR(ret);
-
-       return svsp;
-}
-
-static int svs_probe(struct platform_device *pdev)
-{
-       struct svs_platform *svsp;
-       int svsp_irq, ret;
-
-       svsp = svs_platform_probe(pdev);
-       if (IS_ERR(svsp))
-               return PTR_ERR(svsp);
+               return ret;
 
        if (!svs_is_efuse_data_correct(svsp)) {
                dev_notice(svsp->dev, "efuse data isn't correct\n");