diff options
| author | Mark Brown <broonie@kernel.org> | 2019-12-10 13:27:14 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-12-10 13:27:14 +0000 |
| commit | 2acf6ce2c25fb71a56ad35fcb9a63c19b20a4f4e (patch) | |
| tree | c1df2943269ea35c97d07eb392008d38430835b4 /sound/soc/soc-pcm.c | |
| parent | 2aae447a4c100d2a7b7cae26b1df8b329e730d8b (diff) | |
| parent | 4e64ba3fd181b207c00d392b27ed484b89108dce (diff) | |
| download | linux-2acf6ce2c25fb71a56ad35fcb9a63c19b20a4f4e.tar.gz linux-2acf6ce2c25fb71a56ad35fcb9a63c19b20a4f4e.tar.bz2 linux-2acf6ce2c25fb71a56ad35fcb9a63c19b20a4f4e.zip | |
Merge branch 'for-5.5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.6
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 76b7ee637e86..01e7bc03d92f 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -637,10 +637,8 @@ out: * This is to ensure there are no pops or clicks in between any music tracks * due to DAPM power cycling. */ -static void close_delayed_work(struct work_struct *work) +static void close_delayed_work(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_pcm_runtime *rtd = - container_of(work, struct snd_soc_pcm_runtime, delayed_work.work); struct snd_soc_dai *codec_dai = rtd->codec_dais[0]; mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass); @@ -660,7 +658,7 @@ static void close_delayed_work(struct work_struct *work) mutex_unlock(&rtd->card->pcm_mutex); } -static void codec2codec_close_delayed_work(struct work_struct *work) +static void codec2codec_close_delayed_work(struct snd_soc_pcm_runtime *rtd) { /* * Currently nothing to do for c2c links @@ -2974,10 +2972,9 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) /* DAPM dai link stream work */ if (rtd->dai_link->params) - INIT_DELAYED_WORK(&rtd->delayed_work, - codec2codec_close_delayed_work); + rtd->close_delayed_work_func = codec2codec_close_delayed_work; else - INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work); + rtd->close_delayed_work_func = close_delayed_work; pcm->nonatomic = rtd->dai_link->nonatomic; rtd->pcm = pcm; |