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

diff --git a/sound/soc/codecs/rt711-sdca-sdw.c b/sound/soc/codecs/rt711-sdca-sdw.c
index 49dacceddf81502e74e3a65758713023f4e4f8dc..a8164fc3979ab85e5509e1a811a5d29d2bb1fac8 100644 (file)
--- a/sound/soc/codecs/rt711-sdca-sdw.c
+++ b/sound/soc/codecs/rt711-sdca-sdw.c
@@ -438,7 +438,7 @@ static int rt711_sdca_dev_resume(struct device *dev)
 {
        struct sdw_slave *slave = dev_to_sdw_dev(dev);
        struct rt711_sdca_priv *rt711 = dev_get_drvdata(dev);
-       unsigned long time;
+       int ret;
 
        if (!rt711->first_hw_init)
                return 0;
@@ -451,20 +451,12 @@ static int rt711_sdca_dev_resume(struct device *dev)
                        rt711->disable_irq = false;
                }
                mutex_unlock(&rt711->disable_irq_lock);
-               goto regmap_sync;
        }
 
-       time = wait_for_completion_timeout(&slave->initialization_complete,
-                               msecs_to_jiffies(RT711_PROBE_TIMEOUT));
-       if (!time) {
-               dev_err(&slave->dev, "%s: Initialization not complete, timed out\n", __func__);
-               sdw_show_ping_status(slave->bus, true);
+       ret = sdw_slave_wait_for_init(slave, RT711_PROBE_TIMEOUT);
+       if (ret)
+               return ret;
 
-               return -ETIMEDOUT;
-       }
-
-regmap_sync:
-       slave->unattach_request = 0;
        regcache_cache_only(rt711->regmap, false);
        regcache_sync(rt711->regmap);
        regcache_cache_only(rt711->mbq_regmap, false);

diff --git a/sound/soc/codecs/rt711-sdw.c b/sound/soc/codecs/rt711-sdw.c
index 72ddf4cebdf366eb2f581d2c39f2442ec014b6ca..df3c43f2ab6b8341c25508379c4664c3d5221021 100644 (file)
--- a/sound/soc/codecs/rt711-sdw.c
+++ b/sound/soc/codecs/rt711-sdw.c
@@ -530,7 +530,7 @@ static int rt711_dev_resume(struct device *dev)
 {
        struct sdw_slave *slave = dev_to_sdw_dev(dev);
        struct rt711_priv *rt711 = dev_get_drvdata(dev);
-       unsigned long time;
+       int ret;
 
        if (!rt711->first_hw_init)
                return 0;
@@ -542,18 +542,12 @@ static int rt711_dev_resume(struct device *dev)
                        rt711->disable_irq = false;
                }
                mutex_unlock(&rt711->disable_irq_lock);
-               goto regmap_sync;
        }
 
-       time = wait_for_completion_timeout(&slave->initialization_complete,
-                               msecs_to_jiffies(RT711_PROBE_TIMEOUT));
-       if (!time) {
-               dev_err(&slave->dev, "%s: Initialization not complete, timed out\n", __func__);
-               return -ETIMEDOUT;
-       }
+       ret = sdw_slave_wait_for_init(slave, RT711_PROBE_TIMEOUT);
+       if (ret)
+               return ret;
 
-regmap_sync:
-       slave->unattach_request = 0;
        regcache_cache_only(rt711->regmap, false);
        regcache_sync_region(rt711->regmap, 0x3000, 0x8fff);
        regcache_sync_region(rt711->regmap, 0x752009, 0x752091);