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

index 90008d2d06e2c77dc3b8b5c71ca99c418cd3412f..1bc6da668bdc45fee247ad15cef0a10fcb75087e 100644 (file)
@@ -1082,22 +1082,12 @@ static s32 tas2783_sdca_dev_resume(struct device *dev)
 {
        struct sdw_slave *slave = dev_to_sdw_dev(dev);
        struct tas2783_prv *tas_dev = dev_get_drvdata(dev);
-       unsigned long t;
-
-       if (!slave->unattach_request)
-               goto regmap_sync;
-
-       t = wait_for_completion_timeout(&slave->initialization_complete,
-                                       msecs_to_jiffies(TAS2783_PROBE_TIMEOUT));
-       if (!t) {
-               dev_err(&slave->dev, "resume: initialization timed out\n");
-               sdw_show_ping_status(slave->bus, true);
-               return -ETIMEDOUT;
-       }
+       int ret;
 
-       slave->unattach_request = 0;
+       ret = sdw_slave_wait_for_init(slave, TAS2783_PROBE_TIMEOUT);
+       if (ret)
+               return ret;
 
-regmap_sync:
        regcache_cache_only(tas_dev->regmap, false);
        regcache_sync(tas_dev->regmap);
        return 0;