Commit 80f48143 authored by Mark Brown's avatar Mark Brown

ASoC: Revert widget I/O locking for 3.4

The widget locking depends on some of the other locking changes which
are queued up for 3.5 not 3.4 so revert the locking changes and reapply
them in 3.5.

This reverts commit 66bf9321 and
96acc357.
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent aeb87073
...@@ -206,23 +206,7 @@ static int soc_widget_write(struct snd_soc_dapm_widget *w, int reg, int val) ...@@ -206,23 +206,7 @@ static int soc_widget_write(struct snd_soc_dapm_widget *w, int reg, int val)
return -1; return -1;
} }
static inline void soc_widget_lock(struct snd_soc_dapm_widget *w) static int soc_widget_update_bits(struct snd_soc_dapm_widget *w,
{
if (w->codec && !w->codec->using_regmap)
mutex_lock(&w->codec->mutex);
else if (w->platform)
mutex_lock(&w->platform->mutex);
}
static inline void soc_widget_unlock(struct snd_soc_dapm_widget *w)
{
if (w->codec && !w->codec->using_regmap)
mutex_unlock(&w->codec->mutex);
else if (w->platform)
mutex_unlock(&w->platform->mutex);
}
static int soc_widget_update_bits_locked(struct snd_soc_dapm_widget *w,
unsigned short reg, unsigned int mask, unsigned int value) unsigned short reg, unsigned int mask, unsigned int value)
{ {
bool change; bool change;
...@@ -235,24 +219,18 @@ static int soc_widget_update_bits_locked(struct snd_soc_dapm_widget *w, ...@@ -235,24 +219,18 @@ static int soc_widget_update_bits_locked(struct snd_soc_dapm_widget *w,
if (ret != 0) if (ret != 0)
return ret; return ret;
} else { } else {
soc_widget_lock(w);
ret = soc_widget_read(w, reg); ret = soc_widget_read(w, reg);
if (ret < 0) { if (ret < 0)
soc_widget_unlock(w);
return ret; return ret;
}
old = ret; old = ret;
new = (old & ~mask) | (value & mask); new = (old & ~mask) | (value & mask);
change = old != new; change = old != new;
if (change) { if (change) {
ret = soc_widget_write(w, reg, new); ret = soc_widget_write(w, reg, new);
if (ret < 0) { if (ret < 0)
soc_widget_unlock(w);
return ret; return ret;
}
} }
soc_widget_unlock(w);
} }
return change; return change;
...@@ -869,7 +847,7 @@ int dapm_reg_event(struct snd_soc_dapm_widget *w, ...@@ -869,7 +847,7 @@ int dapm_reg_event(struct snd_soc_dapm_widget *w,
else else
val = w->off_val; val = w->off_val;
soc_widget_update_bits_locked(w, -(w->reg + 1), soc_widget_update_bits(w, -(w->reg + 1),
w->mask << w->shift, val << w->shift); w->mask << w->shift, val << w->shift);
return 0; return 0;
...@@ -1127,7 +1105,7 @@ static void dapm_seq_run_coalesced(struct snd_soc_dapm_context *dapm, ...@@ -1127,7 +1105,7 @@ static void dapm_seq_run_coalesced(struct snd_soc_dapm_context *dapm,
"pop test : Applying 0x%x/0x%x to %x in %dms\n", "pop test : Applying 0x%x/0x%x to %x in %dms\n",
value, mask, reg, card->pop_time); value, mask, reg, card->pop_time);
pop_wait(card->pop_time); pop_wait(card->pop_time);
soc_widget_update_bits_locked(w, reg, mask, value); soc_widget_update_bits(w, reg, mask, value);
} }
list_for_each_entry(w, pending, power_list) { list_for_each_entry(w, pending, power_list) {
...@@ -1257,7 +1235,7 @@ static void dapm_widget_update(struct snd_soc_dapm_context *dapm) ...@@ -1257,7 +1235,7 @@ static void dapm_widget_update(struct snd_soc_dapm_context *dapm)
w->name, ret); w->name, ret);
} }
ret = soc_widget_update_bits_locked(w, update->reg, update->mask, ret = snd_soc_update_bits(w->codec, update->reg, update->mask,
update->val); update->val);
if (ret < 0) if (ret < 0)
pr_err("%s DAPM update failed: %d\n", w->name, ret); pr_err("%s DAPM update failed: %d\n", w->name, ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment