提交 ab87ce1d 编写于 作者: L Lars-Peter Clausen 提交者: Mark Brown

ASoC: wm8971: Use system_power_efficient_wq instead of custom workqueue

The delayed work used by the wm8971 driver to manage the caps charging
doesn't have any special requirements that would justify using a custom
workqueue, just use the generic system_power_efficient_wq instead.
Signed-off-by: NLars-Peter Clausen <lars@metafoo.de>
Acked-by: NCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: NMark Brown <broonie@kernel.org>
上级 c517d838
...@@ -31,8 +31,6 @@ ...@@ -31,8 +31,6 @@
#define WM8971_REG_COUNT 43 #define WM8971_REG_COUNT 43
static struct workqueue_struct *wm8971_workq = NULL;
/* codec private data */ /* codec private data */
struct wm8971_priv { struct wm8971_priv {
unsigned int sysclk; unsigned int sysclk;
...@@ -636,7 +634,8 @@ static int wm8971_resume(struct snd_soc_codec *codec) ...@@ -636,7 +634,8 @@ static int wm8971_resume(struct snd_soc_codec *codec)
reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e; reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e;
snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0); snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0);
codec->dapm.bias_level = SND_SOC_BIAS_ON; codec->dapm.bias_level = SND_SOC_BIAS_ON;
queue_delayed_work(wm8971_workq, &codec->dapm.delayed_work, queue_delayed_work(system_power_efficient_wq,
&codec->dapm.delayed_work,
msecs_to_jiffies(1000)); msecs_to_jiffies(1000));
} }
...@@ -649,9 +648,6 @@ static int wm8971_probe(struct snd_soc_codec *codec) ...@@ -649,9 +648,6 @@ static int wm8971_probe(struct snd_soc_codec *codec)
u16 reg; u16 reg;
INIT_DELAYED_WORK(&codec->dapm.delayed_work, wm8971_work); INIT_DELAYED_WORK(&codec->dapm.delayed_work, wm8971_work);
wm8971_workq = create_workqueue("wm8971");
if (wm8971_workq == NULL)
return -ENOMEM;
wm8971_reset(codec); wm8971_reset(codec);
...@@ -659,7 +655,8 @@ static int wm8971_probe(struct snd_soc_codec *codec) ...@@ -659,7 +655,8 @@ static int wm8971_probe(struct snd_soc_codec *codec)
reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e; reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e;
snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0); snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0);
codec->dapm.bias_level = SND_SOC_BIAS_STANDBY; codec->dapm.bias_level = SND_SOC_BIAS_STANDBY;
queue_delayed_work(wm8971_workq, &codec->dapm.delayed_work, queue_delayed_work(system_power_efficient_wq,
&codec->dapm.delayed_work,
msecs_to_jiffies(1000)); msecs_to_jiffies(1000));
/* set the update bits */ /* set the update bits */
...@@ -681,8 +678,6 @@ static int wm8971_remove(struct snd_soc_codec *codec) ...@@ -681,8 +678,6 @@ static int wm8971_remove(struct snd_soc_codec *codec)
{ {
wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF); wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF);
if (wm8971_workq)
destroy_workqueue(wm8971_workq);
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册