---
  drivers/soc/mediatek/mtk-svs.c | 69 ++++++++++++----------------------
  1 file changed, 24 insertions(+), 45 deletions(-)

diff --git a/drivers/soc/mediatek/mtk-svs.c b/drivers/soc/mediatek/mtk-svs.c
index bd23d1111d7b..a7f0a6f02d52 100644
--- a/drivers/soc/mediatek/mtk-svs.c
+++ b/drivers/soc/mediatek/mtk-svs.c

@@ -1758,26 +1758,28 @@ static int svs_bank_resource_setup(struct svs_platform *svsp)
  	return 0;
  }
  
-static int svs_thermal_efuse_get_data(struct svs_platform *svsp)
+static int svs_get_efuse_data(struct svs_platform *svsp,
+			      const char *nvmem_cell_name,
+			      u32 **svsp_efuse, size_t *svsp_efuse_max)
  {
  	struct nvmem_cell *cell;
  
-	/* Thermal efuse parsing */
-	cell = nvmem_cell_get(svsp->dev, "t-calibration-data");
+	cell = nvmem_cell_get(svsp->dev, nvmem_cell_name);
  	if (IS_ERR_OR_NULL(cell)) {
-		dev_err(svsp->dev, "no \"t-calibration-data\"? %ld\n", PTR_ERR(cell));
+		dev_err(svsp->dev, "no \"%s\"? %ld\n",
+			nvmem_cell_name, PTR_ERR(cell));
  		return PTR_ERR(cell);
  	}
  
-	svsp->tefuse = nvmem_cell_read(cell, &svsp->tefuse_max);
-	if (IS_ERR(svsp->tefuse)) {
-		dev_err(svsp->dev, "cannot read thermal efuse: %ld\n",
-			PTR_ERR(svsp->tefuse));
+	*svsp_efuse = nvmem_cell_read(cell, svsp_efuse_max);
+	if (IS_ERR(*svsp_efuse)) {
+		dev_err(svsp->dev, "cannot read \"%s\" efuse: %ld\n",
+			nvmem_cell_name, PTR_ERR(*svsp_efuse));
  		nvmem_cell_put(cell);
-		return PTR_ERR(svsp->tefuse);
+		return PTR_ERR(*svsp_efuse);
  	}
  
-	svsp->tefuse_max /= sizeof(u32);
+	*svsp_efuse_max /= sizeof(u32);
  	nvmem_cell_put(cell);
  
  	return 0;

@@ -1825,7 +1827,8 @@ static bool svs_mt8192_efuse_parsing(struct svs_platform *svsp)
  		svsb->vmax += svsb->dvt_fixed;
  	}
  
-	ret = svs_thermal_efuse_get_data(svsp);
+	ret = svs_get_efuse_data(svsp, "t-calibration-data",
+				 &svsp->tefuse, &svsp->tefuse_max);
  	if (ret)
  		return false;
  

@@ -1930,7 +1933,8 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp)
  		}
  	}
  
-	ret = svs_thermal_efuse_get_data(svsp);
+	ret = svs_get_efuse_data(svsp, "t-calibration-data",
+				 &svsp->tefuse, &svsp->tefuse_max);
  	if (ret)
  		return false;
  

@@ -2039,32 +2043,6 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp)
  	return true;
  }
  
-static bool svs_is_efuse_data_correct(struct svs_platform *svsp)
-{
-	struct nvmem_cell *cell;
-
-	/* Get svs efuse by nvmem */
-	cell = nvmem_cell_get(svsp->dev, "svs-calibration-data");
-	if (IS_ERR(cell)) {
-		dev_err(svsp->dev, "no \"svs-calibration-data\"? %ld\n",
-			PTR_ERR(cell));
-		return false;
-	}
-
-	svsp->efuse = nvmem_cell_read(cell, &svsp->efuse_max);
-	if (IS_ERR(svsp->efuse)) {
-		dev_err(svsp->dev, "cannot read svs efuse: %ld\n",
-			PTR_ERR(svsp->efuse));
-		nvmem_cell_put(cell);
-		return false;
-	}
-
-	svsp->efuse_max /= sizeof(u32);
-	nvmem_cell_put(cell);
-
-	return true;
-}
-
  static struct device *svs_get_subsys_device(struct svs_platform *svsp,
  					    const char *node_name)
  {

@@ -2404,8 +2382,9 @@ static int svs_probe(struct platform_device *pdev)
  	if (ret)
  		return ret;
  
-	if (!svs_is_efuse_data_correct(svsp)) {
-		dev_notice(svsp->dev, "efuse data isn't correct\n");
+	ret = svs_get_efuse_data(svsp, "svs-calibration-data",
+				 &svsp->efuse, &svsp->efuse_max);
+	if (ret) {
  		ret = -EPERM;
  		goto svs_probe_free_efuse;
  	}

@@ -2413,13 +2392,13 @@ static int svs_probe(struct platform_device *pdev)
  	if (!svsp_data->efuse_parsing(svsp)) {
  		dev_err(svsp->dev, "efuse data parsing failed\n");
  		ret = -EPERM;
-		goto svs_probe_free_resource;
+		goto svs_probe_free_tefuse;
  	}
  
  	ret = svs_bank_resource_setup(svsp);
  	if (ret) {
  		dev_err(svsp->dev, "svs bank resource setup fail: %d\n", ret);
-		goto svs_probe_free_resource;
+		goto svs_probe_free_tefuse;
  	}
  
  	svsp->main_clk = devm_clk_get(svsp->dev, "main");

@@ -2427,12 +2406,12 @@ static int svs_probe(struct platform_device *pdev)
  		dev_err(svsp->dev, "failed to get clock: %ld\n",
  			PTR_ERR(svsp->main_clk));
  		ret = PTR_ERR(svsp->main_clk);
-		goto svs_probe_free_resource;
+		goto svs_probe_free_tefuse;
  	}
  
  	ret = svs_clk_enable(svsp);
  	if (ret)
-		goto svs_probe_free_resource;
+		goto svs_probe_free_tefuse;
  
  	svsp->base = of_iomap(svsp->dev->of_node, 0);
  	if (IS_ERR_OR_NULL(svsp->base)) {

@@ -2477,7 +2456,7 @@ static int svs_probe(struct platform_device *pdev)
  svs_probe_clk_disable:
  	svs_clk_disable(svsp);
  
-svs_probe_free_resource:
+svs_probe_free_tefuse:
  	if (!IS_ERR_OR_NULL(svsp->tefuse))
  		kfree(svsp->tefuse);