Commit 4e15e819710e for kernel
commit 4e15e819710e3518ec28735a12e0f45b7550290d
Merge: d295082ea672 dc3a6a942e9e
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue Feb 17 10:07:13 2026 -0800
Merge tag 'soundwire-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire
Pull soundwire updates from Vinod Koul:
- support for Qualcomm v2.2.0 controllers
- bus method updates for .probe(), .remove() and .shutdown()
and remove function return value updates
- Avell B.ON dmi-quirks mapping
- mark cs42l45 codec as wake capable
* tag 'soundwire-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
soundwire: intel_ace2x: add SND_HDA_CORE dependency
dt-bindings: soundwire: qcom: Add SoundWire v2.2.0 compatible
soundwire: Use bus methods for .probe(), .remove() and .shutdown()
soundwire: Make remove function return no value
soundwire: dmi-quirks: add mapping for Avell B.ON (OEM rebranded of NUC15)
soundwire: qcom: Use guard to avoid mixing cleanup and goto
soundwire: intel_auxdevice: add cs42l45 codec to wake_capable_list
diff --cc sound/soc/codecs/rt1320-sdw.c
index 977881994e60,d03e8dbd0cda..50f65662e143
--- a/sound/soc/codecs/rt1320-sdw.c
+++ b/sound/soc/codecs/rt1320-sdw.c
@@@ -2950,14 -1740,9 +2950,12 @@@ static int rt1320_sdw_probe(struct sdw_
return rt1320_sdw_init(&slave->dev, regmap, mbq_regmap, slave);
}
- static int rt1320_sdw_remove(struct sdw_slave *slave)
+ static void rt1320_sdw_remove(struct sdw_slave *slave)
{
+ struct rt1320_sdw_priv *rt1320 = dev_get_drvdata(&slave->dev);
+
+ cancel_work_sync(&rt1320->load_dspfw_work);
pm_runtime_disable(&slave->dev);
-
- return 0;
}
/*
diff --cc sound/soc/codecs/wcd939x-sdw.c
index 399dfba79aa2,965c768e7995..95f4be287e79
--- a/sound/soc/codecs/wcd939x-sdw.c
+++ b/sound/soc/codecs/wcd939x-sdw.c
@@@ -1401,15 -1406,23 +1401,13 @@@ static int wcd9390_probe(struct sdw_sla
pm_runtime_set_suspended(dev);
return 0;
-
-err_free_regmap:
- if (wcd->regmap)
- regmap_exit(wcd->regmap);
-
- return ret;
}
- static int wcd9390_remove(struct sdw_slave *pdev)
+ static void wcd9390_remove(struct sdw_slave *pdev)
{
struct device *dev = &pdev->dev;
- struct wcd939x_sdw_priv *wcd = dev_get_drvdata(dev);
component_del(dev, &wcd_sdw_component_ops);
--
- return 0;
- if (wcd->regmap)
- regmap_exit(wcd->regmap);
}
static const struct sdw_device_id wcd9390_slave_id[] = {