[1/3] ASoC: fsl: Replace tasklet with work

Commit Message

Takashi Iwai Sept. 3, 2020, 10:47 a.m. UTC

The tasklet is an old API that should be deprecated, usually can be
converted to another decent API.  In ASoC FSL ESAI CPU DAI driver, a
tasklet is still used for offloading the hardware reset function.
It can be achieved gracefully with a work queued, too.

This patch replaces the tasklet usage in fsl esai driver with a simple
work.  The conversion is fairly straightforward.

Signed-off-by: Takashi Iwai <[e-mail]>
---
 sound/soc/fsl/fsl_esai.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Mark Brown Sept. 9, 2020, 2:16 p.m. UTC | #1

On Thu, Sep 03, 2020 at 12:47:47PM +0200, Takashi Iwai wrote:
> The tasklet is an old API that should be deprecated, usually can be
> converted to another decent API.  In ASoC FSL ESAI CPU DAI driver, a
> tasklet is still used for offloading the hardware reset function.
> It can be achieved gracefully with a work queued, too.

This doesn't apply against current code, please check and resend.

Takashi Iwai Sept. 9, 2020, 2:21 p.m. UTC | #2

On Wed, 09 Sep 2020 16:16:59 +0200,
Mark Brown wrote:
> 
> On Thu, Sep 03, 2020 at 12:47:47PM +0200, Takashi Iwai wrote:
> > The tasklet is an old API that should be deprecated, usually can be
> > converted to another decent API.  In ASoC FSL ESAI CPU DAI driver, a
> > tasklet is still used for offloading the hardware reset function.
> > It can be achieved gracefully with a work queued, too.
> 
> This doesn't apply against current code, please check and resend.

Did you merge either Linus tree (v5.9-rc4) or my topic/tasklet-convert
branch into yours beforehand?  There are tasklet API conversions
landed in 5.9-rc4, and these patches are based on it.


Takashi

Mark Brown Sept. 9, 2020, 2:48 p.m. UTC | #3

On Wed, Sep 09, 2020 at 04:21:35PM +0200, Takashi Iwai wrote:
> Mark Brown wrote:

> > This doesn't apply against current code, please check and resend.

> Did you merge either Linus tree (v5.9-rc4) or my topic/tasklet-convert
> branch into yours beforehand?  There are tasklet API conversions
> landed in 5.9-rc4, and these patches are based on it.

Yeah, since sending this I think I got your branch - I'd misread the
cover as saying it worked with that not that it was a dependency.

Patch

diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 79b861afd986..39637ca78cdb 100644
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -41,7 +41,7 @@  struct fsl_esai_soc_data {
  * @extalclk: esai clock source to derive HCK, SCK and FS
  * @fsysclk: system clock source to derive HCK, SCK and FS
  * @spbaclk: SPBA clock (optional, depending on SoC design)
- * @task: tasklet to handle the reset operation
+ * @work: work to handle the reset operation
  * @soc: soc specific data
  * @lock: spin lock between hw_reset() and trigger()
  * @fifo_depth: depth of tx/rx FIFO
@@ -67,7 +67,7 @@  struct fsl_esai {
 	struct clk *extalclk;
 	struct clk *fsysclk;
 	struct clk *spbaclk;
-	struct tasklet_struct task;
+	struct work_struct work;
 	const struct fsl_esai_soc_data *soc;
 	spinlock_t lock; /* Protect hw_reset and trigger */
 	u32 fifo_depth;
@@ -117,7 +117,7 @@  static irqreturn_t esai_isr(int irq, void *devid)
 				   ESAI_xCR_xEIE_MASK, 0);
 		regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR,
 				   ESAI_xCR_xEIE_MASK, 0);
-		tasklet_schedule(&esai_priv->task);
+		schedule_work(&esai_priv->work);
 	}
 
 	if (esr & ESAI_ESR_TINIT_MASK)
@@ -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(struct tasklet_struct *t)
+static void fsl_esai_hw_reset(struct work_struct *work)
 {
-	struct fsl_esai *esai_priv = from_tasklet(esai_priv, t, task);
+	struct fsl_esai *esai_priv = container_of(work, struct fsl_esai, work);
 	bool tx = true, rx = false, enabled[2];
 	unsigned long lock_flags;
 	u32 tfcr, rfcr;
@@ -1070,7 +1070,7 @@  static int fsl_esai_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	tasklet_setup(&esai_priv->task, fsl_esai_hw_reset);
+	INIT_WORK(&esai_priv->work, fsl_esai_hw_reset);
 
 	pm_runtime_enable(&pdev->dev);
 
@@ -1088,7 +1088,7 @@  static int fsl_esai_remove(struct platform_device *pdev)
 	struct fsl_esai *esai_priv = platform_get_drvdata(pdev);
 
 	pm_runtime_disable(&pdev->dev);
-	tasklet_kill(&esai_priv->task);
+	cancel_work_sync(&esai_priv->work);
 
 	return 0;
 }