diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2026-06-02 13:27:49 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-06-02 18:19:55 +0300 |
| commit | aec0d8c8869424645560c773418d6b8752027278 (patch) | |
| tree | 91abdd2dbeca1fc6cdc6c217016e05541e0391e0 | |
| parent | 44a4b0e62bcbd2c49713fe0f3035b095632ce946 (diff) | |
| download | linux-aec0d8c8869424645560c773418d6b8752027278.tar.xz | |
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.
Link: https://lore.kernel.org/linux-sound/20260512103022.1154645-1-ckeepax@opensource.cirrus.com/
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20260602102749.3962261-1-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/es9356.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/sound/soc/codecs/es9356.c b/sound/soc/codecs/es9356.c index 78fddd9d0171..670e918b56a4 100644 --- a/sound/soc/codecs/es9356.c +++ b/sound/soc/codecs/es9356.c @@ -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; |