mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 09:36:22 +02:00
ASoC: rt5682: Use new SoundWire enumeration helper
Now the new wait for SoundWire enumeration helper no longer depends on unattach_request it is safe to use from probe time. Update the driver to use the new core helper. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com> Tested-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com> Link: https://patch.msgid.link/20260608102714.2503120-5-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
f0eb67c618
commit
933feddee4
|
|
@ -2929,20 +2929,14 @@ static int rt5682_probe(struct snd_soc_component *component)
|
|||
{
|
||||
struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component);
|
||||
struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
|
||||
struct sdw_slave *slave;
|
||||
unsigned long time;
|
||||
int ret;
|
||||
|
||||
rt5682->component = component;
|
||||
|
||||
if (rt5682->is_sdw) {
|
||||
slave = rt5682->slave;
|
||||
time = wait_for_completion_timeout(
|
||||
&slave->initialization_complete,
|
||||
msecs_to_jiffies(RT5682_PROBE_TIMEOUT));
|
||||
if (!time) {
|
||||
dev_err(&slave->dev, "Initialization not complete, timed out\n");
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
ret = sdw_slave_wait_for_init(rt5682->slave, RT5682_PROBE_TIMEOUT);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
snd_soc_dapm_disable_pin(dapm, "MICBIAS");
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user