summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/avs/utils.c
diff options
context:
space:
mode:
authorCezary Rojewski <cezary.rojewski@intel.com>2022-12-02 16:28:30 +0100
committerMark Brown <broonie@kernel.org>2022-12-05 14:05:22 +0000
commit58029b7734ec84738aeb8fb391e625832bb6b0a6 (patch)
tree8dfb416899bb581d6bdaa3053fe46f2ec1fec78a /sound/soc/intel/avs/utils.c
parentbb03099bf2253fcd1a4d57e6f5ee4e8000911e77 (diff)
downloadlinux-stable-58029b7734ec84738aeb8fb391e625832bb6b0a6.tar.gz
linux-stable-58029b7734ec84738aeb8fb391e625832bb6b0a6.tar.bz2
linux-stable-58029b7734ec84738aeb8fb391e625832bb6b0a6.zip
ASoC: Intel: avs: Drop fifo_lock
Log gathering is already locked, thanks to ->trace_lock. Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> Link: https://lore.kernel.org/r/20221202152841.672536-6-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/avs/utils.c')
-rw-r--r--sound/soc/intel/avs/utils.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/intel/avs/utils.c b/sound/soc/intel/avs/utils.c
index 13611dee9787..75ad434d7dfb 100644
--- a/sound/soc/intel/avs/utils.c
+++ b/sound/soc/intel/avs/utils.c
@@ -301,14 +301,11 @@ void avs_release_firmwares(struct avs_dev *adev)
}
}
-unsigned int __kfifo_fromio_locked(struct kfifo *fifo, const void __iomem *src, unsigned int len,
- spinlock_t *lock)
+unsigned int __kfifo_fromio(struct kfifo *fifo, const void __iomem *src, unsigned int len)
{
struct __kfifo *__fifo = &fifo->kfifo;
- unsigned long flags;
unsigned int l, off;
- spin_lock_irqsave(lock, flags);
len = min(len, kfifo_avail(fifo));
off = __fifo->in & __fifo->mask;
l = min(len, kfifo_size(fifo) - off);
@@ -318,7 +315,6 @@ unsigned int __kfifo_fromio_locked(struct kfifo *fifo, const void __iomem *src,
/* Make sure data copied from SRAM is visible to all CPUs. */
smp_mb();
__fifo->in += len;
- spin_unlock_irqrestore(lock, flags);
return len;
}