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

diff --git a/sound/soc/codecs/rt715-sdca-sdw.c b/sound/soc/codecs/rt715-sdca-sdw.c
index 968bc183b8d8cea15f0506779664980e8538f611..4b9815b5628dbe2a0084c70394a6ce5f7e0a4a7e 100644 (file)
--- a/sound/soc/codecs/rt715-sdca-sdw.c
+++ b/sound/soc/codecs/rt715-sdca-sdw.c
@@ -224,25 +224,15 @@ static int rt715_dev_resume(struct device *dev)
 {
        struct sdw_slave *slave = dev_to_sdw_dev(dev);
        struct rt715_sdca_priv *rt715 = dev_get_drvdata(dev);
-       unsigned long time;
+       int ret;
 
        if (!rt715->first_hw_init)
                return 0;
 
-       if (!slave->unattach_request)
-               goto regmap_sync;
+       ret = sdw_slave_wait_for_init(slave, RT715_PROBE_TIMEOUT);
+       if (ret)
+               return ret;
 
-       time = wait_for_completion_timeout(&slave->initialization_complete,
-                                          msecs_to_jiffies(RT715_PROBE_TIMEOUT));
-       if (!time) {
-               dev_err(&slave->dev, "%s: Initialization not complete, timed out\n", __func__);
-               sdw_show_ping_status(slave->bus, true);
-
-               return -ETIMEDOUT;
-       }
-
-regmap_sync:
-       slave->unattach_request = 0;
        regcache_cache_only(rt715->regmap, false);
        regcache_sync_region(rt715->regmap,
                SDW_SDCA_CTL(FUN_JACK_CODEC, RT715_SDCA_ST_EN, RT715_SDCA_ST_CTRL,

diff --git a/sound/soc/codecs/rt715-sdw.c b/sound/soc/codecs/rt715-sdw.c
index 49c91d015be4d32f085f61e721b92054294ba44e..7f83a8f1a06e981a10f17dedce864de326f836f6 100644 (file)
--- a/sound/soc/codecs/rt715-sdw.c
+++ b/sound/soc/codecs/rt715-sdw.c
@@ -501,25 +501,15 @@ static int rt715_dev_resume(struct device *dev)
 {
        struct sdw_slave *slave = dev_to_sdw_dev(dev);
        struct rt715_priv *rt715 = dev_get_drvdata(dev);
-       unsigned long time;
+       int ret;
 
        if (!rt715->first_hw_init)
                return 0;
 
-       if (!slave->unattach_request)
-               goto regmap_sync;
-
-       time = wait_for_completion_timeout(&slave->initialization_complete,
-                                          msecs_to_jiffies(RT715_PROBE_TIMEOUT));
-       if (!time) {
-               dev_err(&slave->dev, "%s: Initialization not complete, timed out\n", __func__);
-               sdw_show_ping_status(slave->bus, true);
-
-               return -ETIMEDOUT;
-       }
+       ret = sdw_slave_wait_for_init(slave, RT715_PROBE_TIMEOUT);
+       if (ret)
+               return ret;
 
-regmap_sync:
-       slave->unattach_request = 0;
        regcache_cache_only(rt715->regmap, false);
        regcache_sync_region(rt715->regmap, 0x3000, 0x8fff);
        regcache_sync_region(rt715->regmap, 0x752039, 0x752039);