ASoC: rt1308: 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.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20260512103022.1154645-14-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.c
index e077d096bc239c0f2f294a919df699d90fa6c654..39e06a3a75609a15015c9d976fa2f50640787c9c 100644 (file)
--- a/sound/soc/codecs/rt1308-sdw.c
+++ b/sound/soc/codecs/rt1308-sdw.c
@@ -768,25 +768,15 @@ static int rt1308_dev_resume(struct device *dev)
 {
        struct sdw_slave *slave = dev_to_sdw_dev(dev);
        struct rt1308_sdw_priv *rt1308 = dev_get_drvdata(dev);
-       unsigned long time;
+       int ret;
 
        if (!rt1308->first_hw_init)
                return 0;
 
-       if (!slave->unattach_request)
-               goto regmap_sync;
-
-       time = wait_for_completion_timeout(&slave->initialization_complete,
-                               msecs_to_jiffies(RT1308_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, RT1308_PROBE_TIMEOUT);
+       if (ret)
+               return ret;
 
-regmap_sync:
-       slave->unattach_request = 0;
        regcache_cache_only(rt1308->regmap, false);
        regcache_sync_region(rt1308->regmap, 0xc000, 0xcfff);