diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2026-05-12 13:30:18 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-05-12 13:47:10 +0300 |
| commit | b7997fcacf94dbb332339b7a9ceb4caeba70aa47 (patch) | |
| tree | 5ab06284a9972fd55977e110ba962b573061818b | |
| parent | 1ab950b47b3ae7fe10634044b7fc3e5c080bf4f3 (diff) | |
| download | linux-b7997fcacf94dbb332339b7a9ceb4caeba70aa47.tar.xz | |
ASoC: rt1316: 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-15-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/rt1316-sdw.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/sound/soc/codecs/rt1316-sdw.c b/sound/soc/codecs/rt1316-sdw.c index 20fc1579eb9c..1828fd9d5af6 100644 --- a/sound/soc/codecs/rt1316-sdw.c +++ b/sound/soc/codecs/rt1316-sdw.c @@ -745,25 +745,15 @@ static int rt1316_dev_resume(struct device *dev) { struct sdw_slave *slave = dev_to_sdw_dev(dev); struct rt1316_sdw_priv *rt1316 = dev_get_drvdata(dev); - unsigned long time; + int ret; if (!rt1316->first_hw_init) return 0; - if (!slave->unattach_request) - goto regmap_sync; - - time = wait_for_completion_timeout(&slave->initialization_complete, - msecs_to_jiffies(RT1316_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, RT1316_PROBE_TIMEOUT); + if (ret) + return ret; -regmap_sync: - slave->unattach_request = 0; regcache_cache_only(rt1316->regmap, false); regcache_sync(rt1316->regmap); |