diff options
| author | Mark Brown <broonie@kernel.org> | 2020-09-09 15:20:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-09-09 15:20:17 +0100 |
| commit | 05680cc0e584de91b5bd6a705d2115227c5b53ae (patch) | |
| tree | 08775558b8454bb8d4e0169608a782b3767bcd0c /sound/soc/fsl | |
| parent | bc442e472ca6120e8a763f4e0392fa41786e2883 (diff) | |
| parent | 07da90b0e5fc299c0ce4d34d1916d7a79b86848b (diff) | |
| download | linux-05680cc0e584de91b5bd6a705d2115227c5b53ae.tar.bz2 | |
Merge branch 'topic/tasklet-convert' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-5.10
Diffstat (limited to 'sound/soc/fsl')
| -rw-r--r-- | sound/soc/fsl/fsl_esai.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index 4ae36099ae82..79b861afd986 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -708,9 +708,9 @@ static void fsl_esai_trigger_stop(struct fsl_esai *esai_priv, bool tx) ESAI_xFCR_xFR, 0); } -static void fsl_esai_hw_reset(unsigned long arg) +static void fsl_esai_hw_reset(struct tasklet_struct *t) { - struct fsl_esai *esai_priv = (struct fsl_esai *)arg; + struct fsl_esai *esai_priv = from_tasklet(esai_priv, t, task); bool tx = true, rx = false, enabled[2]; unsigned long lock_flags; u32 tfcr, rfcr; @@ -1070,8 +1070,7 @@ static int fsl_esai_probe(struct platform_device *pdev) return ret; } - tasklet_init(&esai_priv->task, fsl_esai_hw_reset, - (unsigned long)esai_priv); + tasklet_setup(&esai_priv->task, fsl_esai_hw_reset); pm_runtime_enable(&pdev->dev); |