diff mbox

[PATCHv4,7/9] WM8971 uses msleep to replace work queue

Message ID 1410943275-4160-7-git-send-email-xavier.hsu@linaro.org
State New
Headers show

Commit Message

Xavier Hsu Sept. 17, 2014, 8:41 a.m. UTC 
This patch improves WM8971.
We use msleep to replace work queue.
"As suggested by Mark Brown"

Signed-off-by: Xavier Hsu <xavier.hsu@linaro.org>
Signed-off-by: Andy Green <andy.green@linaro.org>
---
Any comments about improving the patch are welcome.
Thanks.

 sound/soc/codecs/wm8971.c |   27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

Comments

Charles Keepax Sept. 22, 2014, 12:16 p.m. UTC | #1 
On Wed, Sep 17, 2014 at 04:41:13PM +0800, Xavier Hsu wrote:
> This patch improves WM8971.
> We use msleep to replace work queue.
> "As suggested by Mark Brown"
> 
> Signed-off-by: Xavier Hsu <xavier.hsu@linaro.org>
> Signed-off-by: Andy Green <andy.green@linaro.org>
> ---
> Any comments about improving the patch are welcome.
> Thanks.
> 
>  sound/soc/codecs/wm8971.c |   27 ++++-----------------------
>  1 file changed, 4 insertions(+), 23 deletions(-)
> 
> diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
> index 5b38c7a..d081cae 100755
> --- a/sound/soc/codecs/wm8971.c
> +++ b/sound/soc/codecs/wm8971.c
> @@ -36,8 +36,6 @@
>  
>  #define	WM8971_REG_COUNT		43
>  
> -static struct workqueue_struct *wm8971_workq;
> -
>  /* codec private data */
>  struct wm8971_priv {
>  	/* MCLK */
> @@ -779,16 +777,6 @@ static struct snd_soc_dai_driver wm8971_dai = {
>  	.ops = &wm8971_dai_ops,
>  };
>  
> -static void wm8971_work(struct work_struct *work)
> -{
> -	struct snd_soc_dapm_context *dapm =
> -		container_of(work, struct snd_soc_dapm_context,
> -			     delayed_work.work);
> -	struct snd_soc_codec *codec = dapm->codec;
> -
> -	wm8971_set_bias_level(codec, codec->dapm.bias_level);
> -}
> -
>  static int wm8971_suspend(struct snd_soc_codec *codec)
>  {
>  	wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF);
> @@ -806,8 +794,8 @@ static int wm8971_resume(struct snd_soc_codec *codec)
>  		reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e;
>  		snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0);
>  		codec->dapm.bias_level = SND_SOC_BIAS_ON;
> -		queue_delayed_work(wm8971_workq, &codec->dapm.delayed_work,
> -				   msecs_to_jiffies(1000));
> +		wm8971_set_bias_level(codec, codec->dapm.bias_level);
> +		msleep(1000);
>  	}
>  
>  	return 0;
> @@ -818,19 +806,14 @@ static int wm8971_probe(struct snd_soc_codec *codec)
>  	int ret = 0;
>  	u16 reg;
>  
> -	INIT_DELAYED_WORK(&codec->dapm.delayed_work, wm8971_work);
> -	wm8971_workq = create_workqueue("wm8971");
> -	if (wm8971_workq == NULL)
> -		return -ENOMEM;
> -
>  	wm8971_reset(codec);
>  
>  	/* charge output caps - set vmid to 5k for quick power up */
>  	reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e;
>  	snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0);
>  	codec->dapm.bias_level = SND_SOC_BIAS_STANDBY;
> -	queue_delayed_work(wm8971_workq, &codec->dapm.delayed_work,
> -			   msecs_to_jiffies(1000));
> +	wm8971_set_bias_level(codec, codec->dapm.bias_level);
> +	msleep(1000);

Before this patch the bias_level change is after the delay, after
this patch the change is before the delay? That doesn't seem
right?

>  
>  	/* set the update bits */
>  	snd_soc_update_bits(codec, WM8971_LDAC, 0x0100, 0x0100);
> @@ -850,8 +833,6 @@ static int wm8971_remove(struct snd_soc_codec *codec)
>  {
>  	wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF);
>  
> -	if (wm8971_workq)
> -		destroy_workqueue(wm8971_workq);
>  	return 0;
>  }
>  
> -- 
> 1.7.9.5
> 

Thanks,
Charles
Xavier Hsu Sept. 24, 2014, 7:37 a.m. UTC | #2 
Hi Charles :
Thanks for your feedback.
I will move msleep(1000) before I set bias level.
====================================================
msleep(1000);
wm8971_set_bias_level(codec, codec->dapm.bias_level);
====================================================

BR,
Xavier

2014-09-22 20:16 GMT+08:00 Charles Keepax <
ckeepax@opensource.wolfsonmicro.com>:

> On Wed, Sep 17, 2014 at 04:41:13PM +0800, Xavier Hsu wrote:
> > This patch improves WM8971.
> > We use msleep to replace work queue.
> > "As suggested by Mark Brown"
> >
> > Signed-off-by: Xavier Hsu <xavier.hsu@linaro.org>
> > Signed-off-by: Andy Green <andy.green@linaro.org>
> > ---
> > Any comments about improving the patch are welcome.
> > Thanks.
> >
> >  sound/soc/codecs/wm8971.c |   27 ++++-----------------------
> >  1 file changed, 4 insertions(+), 23 deletions(-)
> >
> > diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
> > index 5b38c7a..d081cae 100755
> > --- a/sound/soc/codecs/wm8971.c
> > +++ b/sound/soc/codecs/wm8971.c
> > @@ -36,8 +36,6 @@
> >
> >  #define      WM8971_REG_COUNT                43
> >
> > -static struct workqueue_struct *wm8971_workq;
> > -
> >  /* codec private data */
> >  struct wm8971_priv {
> >       /* MCLK */
> > @@ -779,16 +777,6 @@ static struct snd_soc_dai_driver wm8971_dai = {
> >       .ops = &wm8971_dai_ops,
> >  };
> >
> > -static void wm8971_work(struct work_struct *work)
> > -{
> > -     struct snd_soc_dapm_context *dapm =
> > -             container_of(work, struct snd_soc_dapm_context,
> > -                          delayed_work.work);
> > -     struct snd_soc_codec *codec = dapm->codec;
> > -
> > -     wm8971_set_bias_level(codec, codec->dapm.bias_level);
> > -}
> > -
> >  static int wm8971_suspend(struct snd_soc_codec *codec)
> >  {
> >       wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF);
> > @@ -806,8 +794,8 @@ static int wm8971_resume(struct snd_soc_codec *codec)
> >               reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e;
> >               snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0);
> >               codec->dapm.bias_level = SND_SOC_BIAS_ON;
> > -             queue_delayed_work(wm8971_workq, &codec->dapm.delayed_work,
> > -                                msecs_to_jiffies(1000));
> > +             wm8971_set_bias_level(codec, codec->dapm.bias_level);
> > +             msleep(1000);
> >       }
> >
> >       return 0;
> > @@ -818,19 +806,14 @@ static int wm8971_probe(struct snd_soc_codec
> *codec)
> >       int ret = 0;
> >       u16 reg;
> >
> > -     INIT_DELAYED_WORK(&codec->dapm.delayed_work, wm8971_work);
> > -     wm8971_workq = create_workqueue("wm8971");
> > -     if (wm8971_workq == NULL)
> > -             return -ENOMEM;
> > -
> >       wm8971_reset(codec);
> >
> >       /* charge output caps - set vmid to 5k for quick power up */
> >       reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e;
> >       snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0);
> >       codec->dapm.bias_level = SND_SOC_BIAS_STANDBY;
> > -     queue_delayed_work(wm8971_workq, &codec->dapm.delayed_work,
> > -                        msecs_to_jiffies(1000));
> > +     wm8971_set_bias_level(codec, codec->dapm.bias_level);
> > +     msleep(1000);
>
> Before this patch the bias_level change is after the delay, after
> this patch the change is before the delay? That doesn't seem
> right?
>
> >
> >       /* set the update bits */
> >       snd_soc_update_bits(codec, WM8971_LDAC, 0x0100, 0x0100);
> > @@ -850,8 +833,6 @@ static int wm8971_remove(struct snd_soc_codec *codec)
> >  {
> >       wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF);
> >
> > -     if (wm8971_workq)
> > -             destroy_workqueue(wm8971_workq);
> >       return 0;
> >  }
> >
> > --
> > 1.7.9.5
> >
>
> Thanks,
> Charles
>
diff mbox

Patch

diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index 5b38c7a..d081cae 100755
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -36,8 +36,6 @@ 
 
 #define	WM8971_REG_COUNT		43
 
-static struct workqueue_struct *wm8971_workq;
-
 /* codec private data */
 struct wm8971_priv {
 	/* MCLK */
@@ -779,16 +777,6 @@  static struct snd_soc_dai_driver wm8971_dai = {
 	.ops = &wm8971_dai_ops,
 };
 
-static void wm8971_work(struct work_struct *work)
-{
-	struct snd_soc_dapm_context *dapm =
-		container_of(work, struct snd_soc_dapm_context,
-			     delayed_work.work);
-	struct snd_soc_codec *codec = dapm->codec;
-
-	wm8971_set_bias_level(codec, codec->dapm.bias_level);
-}
-
 static int wm8971_suspend(struct snd_soc_codec *codec)
 {
 	wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF);
@@ -806,8 +794,8 @@  static int wm8971_resume(struct snd_soc_codec *codec)
 		reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e;
 		snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0);
 		codec->dapm.bias_level = SND_SOC_BIAS_ON;
-		queue_delayed_work(wm8971_workq, &codec->dapm.delayed_work,
-				   msecs_to_jiffies(1000));
+		wm8971_set_bias_level(codec, codec->dapm.bias_level);
+		msleep(1000);
 	}
 
 	return 0;
@@ -818,19 +806,14 @@  static int wm8971_probe(struct snd_soc_codec *codec)
 	int ret = 0;
 	u16 reg;
 
-	INIT_DELAYED_WORK(&codec->dapm.delayed_work, wm8971_work);
-	wm8971_workq = create_workqueue("wm8971");
-	if (wm8971_workq == NULL)
-		return -ENOMEM;
-
 	wm8971_reset(codec);
 
 	/* charge output caps - set vmid to 5k for quick power up */
 	reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e;
 	snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0);
 	codec->dapm.bias_level = SND_SOC_BIAS_STANDBY;
-	queue_delayed_work(wm8971_workq, &codec->dapm.delayed_work,
-			   msecs_to_jiffies(1000));
+	wm8971_set_bias_level(codec, codec->dapm.bias_level);
+	msleep(1000);
 
 	/* set the update bits */
 	snd_soc_update_bits(codec, WM8971_LDAC, 0x0100, 0x0100);
@@ -850,8 +833,6 @@  static int wm8971_remove(struct snd_soc_codec *codec)
 {
 	wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
-	if (wm8971_workq)
-		destroy_workqueue(wm8971_workq);
 	return 0;
 }