diff options
| author | Cezary Rojewski <cezary.rojewski@intel.com> | 2022-12-02 16:28:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-12-05 14:05:22 +0000 |
| commit | 58029b7734ec84738aeb8fb391e625832bb6b0a6 (patch) | |
| tree | 8dfb416899bb581d6bdaa3053fe46f2ec1fec78a /sound/soc/intel/avs/apl.c | |
| parent | bb03099bf2253fcd1a4d57e6f5ee4e8000911e77 (diff) | |
| download | linux-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/apl.c')
| -rw-r--r-- | sound/soc/intel/avs/apl.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/intel/avs/apl.c b/sound/soc/intel/avs/apl.c index 821d5a9ad25f..66672ffd95df 100644 --- a/sound/soc/intel/avs/apl.c +++ b/sound/soc/intel/avs/apl.c @@ -65,13 +65,12 @@ static int apl_log_buffer_status(struct avs_dev *adev, union avs_notify_msg *msg buf = apl_log_payload_addr(addr); if (layout.read_ptr > layout.write_ptr) { - __kfifo_fromio_locked(&adev->dbg.trace_fifo, buf + layout.read_ptr, - apl_log_payload_size(adev) - layout.read_ptr, - &adev->dbg.fifo_lock); + __kfifo_fromio(&adev->dbg.trace_fifo, buf + layout.read_ptr, + apl_log_payload_size(adev) - layout.read_ptr); layout.read_ptr = 0; } - __kfifo_fromio_locked(&adev->dbg.trace_fifo, buf + layout.read_ptr, - layout.write_ptr - layout.read_ptr, &adev->dbg.fifo_lock); + __kfifo_fromio(&adev->dbg.trace_fifo, buf + layout.read_ptr, + layout.write_ptr - layout.read_ptr); wake_up(&adev->dbg.trace_waitq); |