ASoC: rt1017: 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-13-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt1017-sdca-sdw.c b/sound/soc/codecs/rt1017-sdca-sdw.c
index 148b36173a2573bd97ce23d1cdc66de731903949..d62e8a2536767954e2eb64f02085a77f302ff9f8 100644 (file)
--- a/sound/soc/codecs/rt1017-sdca-sdw.c
+++ b/sound/soc/codecs/rt1017-sdca-sdw.c
@@ -773,25 +773,15 @@ static int rt1017_sdca_dev_resume(struct device *dev)
 {
        struct sdw_slave *slave = dev_to_sdw_dev(dev);
        struct rt1017_sdca_priv *rt1017 = dev_get_drvdata(dev);
-       unsigned long time;
+       int ret;
 
        if (!rt1017->first_hw_init)
                return 0;
 
-       if (!slave->unattach_request)
-               goto regmap_sync;
-
-       time = wait_for_completion_timeout(&slave->initialization_complete,
-                               msecs_to_jiffies(RT1017_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, RT1017_PROBE_TIMEOUT);
+       if (ret)
+               return ret;
 
-regmap_sync:
-       slave->unattach_request = 0;
        regcache_cache_only(rt1017->regmap, false);
        regcache_sync(rt1017->regmap);