Unverified Commit 7bd04b8d authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: trace: Simplify count adjustment in trace_read 



The first count check and fixup against "buffer - lpos" can be removed as
we will do the adjustment later against the "avail" in
sof_dfsentry_trace_read()

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220128120627.18443-1-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/trace.c

+2 −4
Original line number Diff line number Diff line
@@ -308,9 +308,6 @@ static ssize_t sof_dfsentry_trace_read(struct file *file, char __user *buffer, 
	lpos_64 = lpos;

	lpos = do_div(lpos_64, buffer_size);



	if (count > buffer_size - lpos) /* min() not used to avoid sparse warnings */

		count = buffer_size - lpos;



	/* get available count based on current host offset */

	avail = sof_wait_trace_avail(sdev, lpos, buffer_size);

	if (sdev->dtrace_error) {
@@ -319,7 +316,8 @@ static ssize_t sof_dfsentry_trace_read(struct file *file, char __user *buffer, 
	}



	/* make sure count is <= avail */

	count = avail > count ? count : avail;

	if (count > avail)

		count = avail;



	/* copy available trace data to debugfs */

	rem = copy_to_user(buffer, ((u8 *)(dfse->buf) + lpos), count);