Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69224719 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Improve DAPM pop_wait delays 



Currently during pop/click debug we're inserting a delay both after
every log message we generate and at explicit points in the sequence,
slowing things down even further than they need to be especially when
many writes get coalesced by the sequence generation code.

Remove the per-printk delay and ensure that we have explicit delays
where we say we want them.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 1d24452b

sound/soc/soc-dapm.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ static void pop_dbg(u32 pop_time, const char *fmt, ...) 


	if (pop_time) {

		vprintk(fmt, args);

		pop_wait(pop_time);

	}



	va_end(args);
@@ -314,8 +313,8 @@ static int dapm_update_bits(struct snd_soc_dapm_widget *widget) 
		pop_dbg(codec->pop_time, "pop test %s : %s in %d ms\n",

			widget->name, widget->power ? "on" : "off",

			codec->pop_time);

		snd_soc_write(codec, widget->reg, new);

		pop_wait(codec->pop_time);

		snd_soc_write(codec, widget->reg, new);

	}

	pr_debug("reg %x old %x new %x change %d\n", widget->reg,

		 old, new, change);
@@ -1075,6 +1074,7 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event) 


	pop_dbg(codec->pop_time, "DAPM sequencing finished, waiting %dms\n",

		codec->pop_time);

	pop_wait(codec->pop_time);



	return 0;

}