ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

iio: adc: stm32-adc: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare

Browse Source 
Because clk_prepare_enable() and clk_disable_unprepare() already checked
NULL clock parameter, so the additional checks are unnecessary, just
remove them.

Signed-off-by: Xu Wang <vulab@iscas.ac.cn>
Acked-by: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
Link: https://lore.kernel.org/r/20201218093512.871-1-vulab@iscas.ac.cn
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Xu Wang
2020-12-18 09:35:12 +00:00
committed by Jonathan Cameron
parent 07fe995f94
commit 58a5e29c5b
2 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/iio/adc/stm32-adc-core.c
View File

@@ -535,20 +535,16 @@ static int stm32_adc_core_hw_start(struct device *dev)
goto err_switches_dis; goto err_switches_dis;
} }
if (priv->bclk) { ret = clk_prepare_enable(priv->bclk);
ret = clk_prepare_enable(priv->bclk); if (ret < 0) {
if (ret < 0) { dev_err(dev, "bus clk enable failed\n");
dev_err(dev, "bus clk enable failed\n"); goto err_regulator_disable;
goto err_regulator_disable;
}
} }
if (priv->aclk) { ret = clk_prepare_enable(priv->aclk);
ret = clk_prepare_enable(priv->aclk); if (ret < 0) {
if (ret < 0) { dev_err(dev, "adc clk enable failed\n");
dev_err(dev, "adc clk enable failed\n"); goto err_bclk_disable;
goto err_bclk_disable;
}
} }
writel_relaxed(priv->ccr_bak, priv->common.base + priv->cfg->regs->ccr); writel_relaxed(priv->ccr_bak, priv->common.base + priv->cfg->regs->ccr);
@@ -556,8 +552,7 @@ static int stm32_adc_core_hw_start(struct device *dev)
return 0; return 0;
err_bclk_disable: err_bclk_disable:
if (priv->bclk) clk_disable_unprepare(priv->bclk);
clk_disable_unprepare(priv->bclk);
err_regulator_disable: err_regulator_disable:
regulator_disable(priv->vref); regulator_disable(priv->vref);
err_switches_dis: err_switches_dis:
@@ -575,10 +570,8 @@ static void stm32_adc_core_hw_stop(struct device *dev)
/* Backup CCR that may be lost (depends on power state to achieve) */ /* Backup CCR that may be lost (depends on power state to achieve) */
priv->ccr_bak = readl_relaxed(priv->common.base + priv->cfg->regs->ccr); priv->ccr_bak = readl_relaxed(priv->common.base + priv->cfg->regs->ccr);
if (priv->aclk) clk_disable_unprepare(priv->aclk);
clk_disable_unprepare(priv->aclk); clk_disable_unprepare(priv->bclk);
if (priv->bclk)
clk_disable_unprepare(priv->bclk);
regulator_disable(priv->vref); regulator_disable(priv->vref);
stm32_adc_core_switches_supply_dis(priv); stm32_adc_core_switches_supply_dis(priv);
regulator_disable(priv->vdda); regulator_disable(priv->vdda);

14
drivers/iio/adc/stm32-adc.c
View File

@@ -546,8 +546,7 @@ static int stm32_adc_hw_stop(struct device *dev)
if (adc->cfg->unprepare) if (adc->cfg->unprepare)
adc->cfg->unprepare(indio_dev); adc->cfg->unprepare(indio_dev);
if (adc->clk) clk_disable_unprepare(adc->clk);
clk_disable_unprepare(adc->clk);
return 0; return 0;
} }
@@ -558,11 +557,9 @@ static int stm32_adc_hw_start(struct device *dev)
struct stm32_adc *adc = iio_priv(indio_dev); struct stm32_adc *adc = iio_priv(indio_dev);
int ret; int ret;
if (adc->clk) { ret = clk_prepare_enable(adc->clk);
ret = clk_prepare_enable(adc->clk); if (ret)
if (ret) return ret;
return ret;
}
stm32_adc_set_res(adc); stm32_adc_set_res(adc);
@@ -575,8 +572,7 @@ static int stm32_adc_hw_start(struct device *dev)
return 0; return 0;
err_clk_dis: err_clk_dis:
if (adc->clk) clk_disable_unprepare(adc->clk);
clk_disable_unprepare(adc->clk);
return ret; return ret;
} }