]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: max98373: Use new SoundWire enumeration helper
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Tue, 12 May 2026 10:30:09 +0000 (11:30 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 12 May 2026 10:47:02 +0000 (19:47 +0900)
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-6-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/max98373-sdw.c

index 16673440218cb55c1272b91e4513d5375675504f..6829fa07c9ecbe0cce8cc3b977cee961002476be 100644 (file)
@@ -266,25 +266,15 @@ static int max98373_resume(struct device *dev)
 {
        struct sdw_slave *slave = dev_to_sdw_dev(dev);
        struct max98373_priv *max98373 = dev_get_drvdata(dev);
-       unsigned long time;
+       int ret;
 
        if (!max98373->first_hw_init)
                return 0;
 
-       if (!slave->unattach_request)
-               goto regmap_sync;
-
-       time = wait_for_completion_timeout(&slave->initialization_complete,
-                                          msecs_to_jiffies(MAX98373_PROBE_TIMEOUT));
-       if (!time) {
-               dev_err(dev, "Initialization not complete, timed out\n");
-               sdw_show_ping_status(slave->bus, true);
-
-               return -ETIMEDOUT;
-       }
+       ret = sdw_slave_wait_for_init(slave, MAX98373_PROBE_TIMEOUT);
+       if (ret)
+               return ret;
 
-regmap_sync:
-       slave->unattach_request = 0;
        regcache_cache_only(max98373->regmap, false);
        regcache_sync(max98373->regmap);