Unverified Commit 83aee46d authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: ipc/ops: Use guard() for spinlocks 



Replace the manual spinlock lock/unlock pairs with guard().

Only code refactoring, and no behavior change.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://patch.msgid.link/20260112101004.7648-8-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 294b9e7e

sound/soc/sof/ipc.c

+1 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ int sof_ipc_send_msg(struct snd_sof_dev *sdev, void *msg_data, size_t msg_bytes, 
	 * The spin-lock is needed to protect message objects against other

	 * atomic contexts.

	 */

	spin_lock_irq(&sdev->ipc_lock);

	guard(spinlock_irq)(&sdev->ipc_lock);



	/* initialise the message */

	msg = &ipc->msg;
@@ -66,8 +66,6 @@ int sof_ipc_send_msg(struct snd_sof_dev *sdev, void *msg_data, size_t msg_bytes, 
	if (!ret)

		msg->ipc_complete = false;



	spin_unlock_irq(&sdev->ipc_lock);



	return ret;

}

sound/soc/sof/ops.c

+7 −27
Original line number Diff line number Diff line
@@ -38,13 +38,8 @@ bool snd_sof_pci_update_bits_unlocked(struct snd_sof_dev *sdev, u32 offset, 
bool snd_sof_pci_update_bits(struct snd_sof_dev *sdev, u32 offset,

			     u32 mask, u32 value)

{

	unsigned long flags;

	bool change;



	spin_lock_irqsave(&sdev->hw_lock, flags);

	change = snd_sof_pci_update_bits_unlocked(sdev, offset, mask, value);

	spin_unlock_irqrestore(&sdev->hw_lock, flags);

	return change;

	guard(spinlock_irqsave)(&sdev->hw_lock);

	return snd_sof_pci_update_bits_unlocked(sdev, offset, mask, value);

}

EXPORT_SYMBOL(snd_sof_pci_update_bits);
@@ -90,28 +85,16 @@ EXPORT_SYMBOL(snd_sof_dsp_update_bits64_unlocked); 
bool snd_sof_dsp_update_bits(struct snd_sof_dev *sdev, u32 bar, u32 offset,

			     u32 mask, u32 value)

{

	unsigned long flags;

	bool change;



	spin_lock_irqsave(&sdev->hw_lock, flags);

	change = snd_sof_dsp_update_bits_unlocked(sdev, bar, offset, mask,

						  value);

	spin_unlock_irqrestore(&sdev->hw_lock, flags);

	return change;

	guard(spinlock_irqsave)(&sdev->hw_lock);

	return snd_sof_dsp_update_bits_unlocked(sdev, bar, offset, mask, value);

}

EXPORT_SYMBOL(snd_sof_dsp_update_bits);



bool snd_sof_dsp_update_bits64(struct snd_sof_dev *sdev, u32 bar, u32 offset,

			       u64 mask, u64 value)

{

	unsigned long flags;

	bool change;



	spin_lock_irqsave(&sdev->hw_lock, flags);

	change = snd_sof_dsp_update_bits64_unlocked(sdev, bar, offset, mask,

						    value);

	spin_unlock_irqrestore(&sdev->hw_lock, flags);

	return change;

	guard(spinlock_irqsave)(&sdev->hw_lock);

	return snd_sof_dsp_update_bits64_unlocked(sdev, bar, offset, mask, value);

}

EXPORT_SYMBOL(snd_sof_dsp_update_bits64);
@@ -134,11 +117,8 @@ void snd_sof_dsp_update_bits_forced_unlocked(struct snd_sof_dev *sdev, u32 bar, 
void snd_sof_dsp_update_bits_forced(struct snd_sof_dev *sdev, u32 bar,

				    u32 offset, u32 mask, u32 value)

{

	unsigned long flags;



	spin_lock_irqsave(&sdev->hw_lock, flags);

	guard(spinlock_irqsave)(&sdev->hw_lock);

	snd_sof_dsp_update_bits_forced_unlocked(sdev, bar, offset, mask, value);

	spin_unlock_irqrestore(&sdev->hw_lock, flags);

}

EXPORT_SYMBOL(snd_sof_dsp_update_bits_forced);