ASoc: rt721: 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-11-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt721-sdca-sdw.c b/sound/soc/codecs/rt721-sdca-sdw.c
index 6eb8512975b85b9fd489492d04890bc3c5839fc1..58606209316a4a9a0e3b2222e102a3ba43ad8004 100644 (file)
--- a/sound/soc/codecs/rt721-sdca-sdw.c
+++ b/sound/soc/codecs/rt721-sdca-sdw.c
@@ -489,7 +489,7 @@ static int rt721_sdca_dev_resume(struct device *dev)
 {
        struct sdw_slave *slave = dev_to_sdw_dev(dev);
        struct rt721_sdca_priv *rt721 = dev_get_drvdata(dev);
-       unsigned long time;
+       int ret;
 
        if (!rt721->first_hw_init)
                return 0;
@@ -502,20 +502,12 @@ static int rt721_sdca_dev_resume(struct device *dev)
                        rt721->disable_irq = false;
                }
                mutex_unlock(&rt721->disable_irq_lock);
-               goto regmap_sync;
        }
 
-       time = wait_for_completion_timeout(&slave->initialization_complete,
-                               msecs_to_jiffies(RT721_PROBE_TIMEOUT));
-       if (!time) {
-               dev_err(&slave->dev, "Initialization not complete, timed out\n");
-               sdw_show_ping_status(slave->bus, true);
+       ret = sdw_slave_wait_for_init(slave, RT721_PROBE_TIMEOUT);
+       if (ret)
+               return ret;
 
-               return -ETIMEDOUT;
-       }
-
-regmap_sync:
-       slave->unattach_request = 0;
        regcache_cache_only(rt721->regmap, false);
        regcache_sync(rt721->regmap);
        regcache_cache_only(rt721->mbq_regmap, false);