samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asoc: codecs: remove devm clean up functions

Browse Source 
Devm clean up functions are removed to avoid calling twice
as these are excuted during removal of device.

Change-Id: Ifddde69d189b59456ef7627f32532198654e40d3
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
This commit is contained in:
Vidyakumar Athota
2018-03-15 19:20:14 -07:00
parent 2ee562b5ee
commit a347bbd7c8
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
asoc/codecs/msm-cdc-supply.c
View File

@@ -309,10 +309,7 @@ int msm_cdc_release_supplies(struct device *dev,
regulator_set_voltage(supplies[i].consumer, 0, regulator_set_voltage(supplies[i].consumer, 0,
cdc_vreg[i].max_uV); cdc_vreg[i].max_uV);
regulator_set_load(supplies[i].consumer, 0); regulator_set_load(supplies[i].consumer, 0);
devm_regulator_put(supplies[i].consumer);
supplies[i].consumer = NULL;
} }
devm_kfree(dev, supplies);
return rc; return rc;
} }
@@ -430,14 +427,14 @@ int msm_cdc_init_supplies(struct device *dev,
if (rc) { if (rc) {
dev_err(dev, "%s: set regulator voltage failed for %s, err:%d\n", dev_err(dev, "%s: set regulator voltage failed for %s, err:%d\n",
__func__, vsup[i].supply, rc); __func__, vsup[i].supply, rc);
goto err_set_supply; goto err_supply;
} }
rc = regulator_set_load(vsup[i].consumer, rc = regulator_set_load(vsup[i].consumer,
cdc_vreg[i].optimum_uA); cdc_vreg[i].optimum_uA);
if (rc < 0) { if (rc < 0) {
dev_err(dev, "%s: set regulator optimum mode failed for %s, err:%d\n", dev_err(dev, "%s: set regulator optimum mode failed for %s, err:%d\n",
__func__, vsup[i].supply, rc); __func__, vsup[i].supply, rc);
goto err_set_supply; goto err_supply;
} }
} }
@@ -445,11 +442,7 @@ int msm_cdc_init_supplies(struct device *dev,
return 0; return 0;
err_set_supply:
for (i = 0; i < num_supplies; i++)
devm_regulator_put(vsup[i].consumer);
err_supply: err_supply:
devm_kfree(dev, vsup);
return rc; return rc;
} }
EXPORT_SYMBOL(msm_cdc_init_supplies); EXPORT_SYMBOL(msm_cdc_init_supplies);
@@ -548,7 +541,6 @@ int msm_cdc_get_power_supplies(struct device *dev,
return 0; return 0;
err_sup: err_sup:
devm_kfree(dev, cdc_reg);
err_supply_cnt: err_supply_cnt:
err_mem_alloc: err_mem_alloc:
return rc; return rc;