Skip to contentSkip to conversation

ASoC: es9356: Use new SoundWire enumeration helper

PATCH In review Charles Keepax 2 participants 2 messages Jun 2 – Jun 3

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: es9356: Use new SoundWire enumeration helper

Update the driver to use the new core helper that waits for the device to enumerate on SoundWire and be initialised by the SoundWire core.

---
 sound/soc/codecs/es9356.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)
sound/soc/codecs/es9356.c +5 -14
index 78fddd9d01711..670e918b56a46 100644
@@ -1105,24 +1105,15 @@ static int es9356_sdca_dev_resume(struct device *dev)
 {
 	struct sdw_slave *slave = dev_to_sdw_dev(dev);
 	struct es9356_sdw_priv *es9356 = dev_get_drvdata(dev);
-	unsigned long time;
+	int ret;
 
-	if (!slave->unattach_request) {
+	if (!slave->unattach_request)
 		es9356->disable_irq = false;
-		goto regmap_sync;
-	}
-
-	time = wait_for_completion_timeout(&slave->initialization_complete,
-				msecs_to_jiffies(es9356_PROBE_TIMEOUT));
-	if (!time) {
-		dev_err(&slave->dev, "Initialization not complete, timed out\n");
-		sdw_show_ping_status(slave->bus, true);
 
-		return -ETIMEDOUT;
-	}
+	ret = sdw_slave_wait_for_init(slave, es9356_PROBE_TIMEOUT);
+	if (ret)
+		return ret;
 
-regmap_sync:
-	slave->unattach_request = 0;
 	regcache_cache_only(es9356->regmap, false);
 	regcache_sync(es9356->regmap);
 	return 0;
Signature · 1 line
2.47.3
maintainer
#1 lore raw
Quoted 1 line · Charles Keepax

ASoC: es9356: Use new SoundWire enumeration helper

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.2

Thanks!

[1/1] ASoC: es9356: Use new SoundWire enumeration helper

      https://git.kernel.org/broonie/sound/c/aec0d8c88694

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark