From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Aug 2025 18:09:27 +0000 (-0700)
Subject: Merge tag 'soundwire-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fac1139d99e283ba0c7ed2d1acad9ec2807ba3a;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'soundwire-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire

Pull soundwire updates from Vinod Koul:
 "A couple of small core changes and driver updates:

   - Core: handling of nesting irqs to outside the lock, stream
     parameters handing on port prep failures.

   - AMD driver support for ACP 7.2 platforms and improved handing of
     slave alerts and resume sequences

   - Qualcomm updating driver debug spew

   - Intel BPT message length limitations, rt721 codec as wake capable
     etc"

* tag 'soundwire-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: amd: Add support for acp7.2 platform
  soundwire: stream: restore params when prepare ports fail
  soundwire: debugfs: move debug statement outside of error handling
  soundwire: amd: add check for status update registers
  soundwire: intel_auxdevice: add rt721 codec to wake_capable_list
  soundwire: Correct some property names
  soundwire: update Intel BPT message length limitation
  soundwire: intel_ace2.x: Use str_read_write() helper
  soundwire: amd: cancel pending slave status handling workqueue during remove sequence
  soundwire: amd: serialize amd manager resume sequence during pm_prepare
  soundwire: qcom: demote probe registration printk
  ASoC: cs42l43: Remove unnecessary work functions
  soundwire: Move handle_nested_irq outside of sdw_dev_lock
  MAINTAINERS: Remove Sanyog Kale as reviewer on SoundWire
---

6fac1139d99e283ba0c7ed2d1acad9ec2807ba3a
diff --cc sound/soc/codecs/cs42l43-jack.c
index f5c5150c25e52,72a4150709de8..2a0a4986a9ce8
--- a/sound/soc/codecs/cs42l43-jack.c
+++ b/sound/soc/codecs/cs42l43-jack.c
@@@ -422,24 -429,16 +428,15 @@@ irqreturn_t cs42l43_button_press(int ir
  error:
  	mutex_unlock(&priv->jack_lock);
  
 -	pm_runtime_mark_last_busy(priv->dev);
  	pm_runtime_put_autosuspend(priv->dev);
- }
- 
- irqreturn_t cs42l43_button_press(int irq, void *data)
- {
- 	struct cs42l43_codec *priv = data;
- 
- 	// Wait for 2 full cycles of comb filter to ensure good reading
- 	queue_delayed_work(system_wq, &priv->button_press_work,
- 			   msecs_to_jiffies(20));
  
- 	return IRQ_HANDLED;
+ 	return iret;
  }
  
- void cs42l43_button_release_work(struct work_struct *work)
+ irqreturn_t cs42l43_button_release(int irq, void *data)
  {
- 	struct cs42l43_codec *priv = container_of(work, struct cs42l43_codec,
- 						  button_release_work);
+ 	struct cs42l43_codec *priv = data;
+ 	irqreturn_t iret = IRQ_NONE;
  	int ret;
  
  	ret = pm_runtime_resume_and_get(priv->dev);
@@@ -460,16 -461,10 +459,9 @@@
  
  	mutex_unlock(&priv->jack_lock);
  
 -	pm_runtime_mark_last_busy(priv->dev);
  	pm_runtime_put_autosuspend(priv->dev);
- }
  
- irqreturn_t cs42l43_button_release(int irq, void *data)
- {
- 	struct cs42l43_codec *priv = data;
- 
- 	queue_work(system_wq, &priv->button_release_work);
- 
- 	return IRQ_HANDLED;
+ 	return iret;
  }
  
  void cs42l43_bias_sense_timeout(struct work_struct *work)