Unverified Commit 680c683c authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: qcom: q6asm-dai: Use guard() for spin locks 



Clean up the code using guard() for spin locks.
No functional changes, just cleanup.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Link: https://patch.msgid.link/20251023102444.88158-20-srinivas.kandagatla@oss.qualcomm.com


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

sound/soc/qcom/qdsp6/q6asm-dai.c

+5 −18
Original line number Diff line number Diff line
@@ -514,15 +514,15 @@ static void compress_event_handler(uint32_t opcode, uint32_t token, 
{

	struct q6asm_dai_rtd *prtd = priv;

	struct snd_compr_stream *substream = prtd->cstream;

	unsigned long flags;

	u32 wflags = 0;

	uint64_t avail;

	uint32_t bytes_written, bytes_to_write;

	bool is_last_buffer = false;



	guard(spinlock_irqsave)(&prtd->lock);



	switch (opcode) {

	case ASM_CLIENT_EVENT_CMD_RUN_DONE:

		spin_lock_irqsave(&prtd->lock, flags);

		if (!prtd->bytes_sent) {

			q6asm_stream_remove_initial_silence(prtd->audio_client,

						    prtd->stream_id,
@@ -533,11 +533,9 @@ static void compress_event_handler(uint32_t opcode, uint32_t token, 
			prtd->bytes_sent += prtd->pcm_count;

		}



		spin_unlock_irqrestore(&prtd->lock, flags);

		break;



	case ASM_CLIENT_EVENT_CMD_EOS_DONE:

		spin_lock_irqsave(&prtd->lock, flags);

		if (prtd->notify_on_drain) {

			if (substream->partial_drain) {

				/*
@@ -560,20 +558,16 @@ static void compress_event_handler(uint32_t opcode, uint32_t token, 
		} else {

			prtd->state = Q6ASM_STREAM_STOPPED;

		}

		spin_unlock_irqrestore(&prtd->lock, flags);

		break;



	case ASM_CLIENT_EVENT_DATA_WRITE_DONE:

		spin_lock_irqsave(&prtd->lock, flags);



		bytes_written = token >> ASM_WRITE_TOKEN_LEN_SHIFT;

		prtd->copied_total += bytes_written;

		snd_compr_fragment_elapsed(substream);



		if (prtd->state != Q6ASM_STREAM_RUNNING) {

			spin_unlock_irqrestore(&prtd->lock, flags);

		if (prtd->state != Q6ASM_STREAM_RUNNING)

			break;

		}



		avail = prtd->bytes_received - prtd->bytes_sent;

		if (avail > prtd->pcm_count) {
@@ -602,7 +596,6 @@ static void compress_event_handler(uint32_t opcode, uint32_t token, 
			q6asm_cmd_nowait(prtd->audio_client,

					 prtd->stream_id, CMD_EOS);



		spin_unlock_irqrestore(&prtd->lock, flags);

		break;



	default:
@@ -1052,17 +1045,14 @@ static int q6asm_dai_compr_pointer(struct snd_soc_component *component, 
{

	struct snd_compr_runtime *runtime = stream->runtime;

	struct q6asm_dai_rtd *prtd = runtime->private_data;

	unsigned long flags;

	uint64_t temp_copied_total;



	spin_lock_irqsave(&prtd->lock, flags);

	guard(spinlock_irqsave)(&prtd->lock);



	tstamp->copied_total = prtd->copied_total;

	temp_copied_total = tstamp->copied_total;

	tstamp->byte_offset = do_div(temp_copied_total, prtd->pcm_size);



	spin_unlock_irqrestore(&prtd->lock, flags);



	return 0;

}
@@ -1072,7 +1062,6 @@ static int q6asm_compr_copy(struct snd_soc_component *component, 
{

	struct snd_compr_runtime *runtime = stream->runtime;

	struct q6asm_dai_rtd *prtd = runtime->private_data;

	unsigned long flags;

	u32 wflags = 0;

	uint64_t avail, bytes_in_flight = 0;

	void *dstn;
@@ -1108,7 +1097,7 @@ static int q6asm_compr_copy(struct snd_soc_component *component, 
			return -EFAULT;

	}



	spin_lock_irqsave(&prtd->lock, flags);

	guard(spinlock_irqsave)(&prtd->lock);



	bytes_in_flight = prtd->bytes_received - prtd->copied_total;
@@ -1134,8 +1123,6 @@ static int q6asm_compr_copy(struct snd_soc_component *component, 
		prtd->bytes_sent += bytes_to_write;

	}



	spin_unlock_irqrestore(&prtd->lock, flags);



	return count;

}