| Message ID | 20201029082513.28233-1-vulab@iscas.ac.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ff3cfccba4dd87bb89ca185b58b38b9a74260138 |
| Headers | show |
| Series | ASoC: ti: davinci-evm: Remove redundant null check before clk_disable_unprepare | expand |
On 29/10/2020 10.25, Xu Wang wrote: > Because clk_disable_unprepare() already checked NULL clock parameter, > so the additional check is unnecessary, just remove it. Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > Signed-off-by: Xu Wang <vulab@iscas.ac.cn> > --- > sound/soc/ti/davinci-evm.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/sound/soc/ti/davinci-evm.c b/sound/soc/ti/davinci-evm.c > index 105e56ab9cdc..b043a0070d20 100644 > --- a/sound/soc/ti/davinci-evm.c > +++ b/sound/soc/ti/davinci-evm.c > @@ -46,8 +46,7 @@ static void evm_shutdown(struct snd_pcm_substream *substream) > struct snd_soc_card_drvdata_davinci *drvdata = > snd_soc_card_get_drvdata(soc_card); > > - if (drvdata->mclk) > - clk_disable_unprepare(drvdata->mclk); > + clk_disable_unprepare(drvdata->mclk); > } > > static int evm_hw_params(struct snd_pcm_substream *substream, > - Péter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
On Thu, 29 Oct 2020 08:25:13 +0000, Xu Wang wrote: > Because clk_disable_unprepare() already checked NULL clock parameter, > so the additional check is unnecessary, just remove it. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: ti: davinci-evm: Remove redundant null check before clk_disable_unprepare commit: ff3cfccba4dd87bb89ca185b58b38b9a74260138 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/ti/davinci-evm.c b/sound/soc/ti/davinci-evm.c index 105e56ab9cdc..b043a0070d20 100644 --- a/sound/soc/ti/davinci-evm.c +++ b/sound/soc/ti/davinci-evm.c @@ -46,8 +46,7 @@ static void evm_shutdown(struct snd_pcm_substream *substream) struct snd_soc_card_drvdata_davinci *drvdata = snd_soc_card_get_drvdata(soc_card); - if (drvdata->mclk) - clk_disable_unprepare(drvdata->mclk); + clk_disable_unprepare(drvdata->mclk); } static int evm_hw_params(struct snd_pcm_substream *substream,
Because clk_disable_unprepare() already checked NULL clock parameter, so the additional check is unnecessary, just remove it. Signed-off-by: Xu Wang <vulab@iscas.ac.cn> --- sound/soc/ti/davinci-evm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)