Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 01:02:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: sh: Use standard helper for buffer accesses

Browse Source 
The SH DAC audio driver uses the kmalloc'ed buffer as the main PCM
buffer, and the data is transferred via hrtimer callbacks manually
from there to the hardware.  Meanwhile, some of its code are written
as if the buffer is on iomem and use the special helpers for the iomem
(e.g. copy_from_iter_toio() or memset_io()).  Those are rather useless
and the standard helpers should be used.

Similarly, the PCM mmap callback is set to a special one with
snd_pcm_lib_mmap_iomem, but this is also nonsense, because SH
architecture doesn't support this function, hence it leads just to
NULL -- the fallback to the standard helper.

This patch replaces those special setups with the standard ones.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202411281337.I4M07b7i-lkp@intel.com/
Link: https://patch.msgid.link/20241128104939.13755-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2024-11-28 11:49:38 +01:00
parent 4f9d674377
commit 9b5f8ee43e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/sh/sh_dac_audio.c
View File

@ -163,7 +163,7 @@ static int snd_sh_dac_pcm_copy(struct snd_pcm_substream *substream,
/* channel is not used (interleaved data) */ /* channel is not used (interleaved data) */
struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); struct snd_sh_dac *chip = snd_pcm_substream_chip(substream);
if (copy_from_iter_toio(chip->data_buffer + pos, src, count)) if (copy_from_iter(chip->data_buffer + pos, src, count) != count)
return -EFAULT; return -EFAULT;
chip->buffer_end = chip->data_buffer + pos + count; chip->buffer_end = chip->data_buffer + pos + count;
@ -182,7 +182,7 @@ static int snd_sh_dac_pcm_silence(struct snd_pcm_substream *substream,
/* channel is not used (interleaved data) */ /* channel is not used (interleaved data) */
struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); struct snd_sh_dac *chip = snd_pcm_substream_chip(substream);
memset_io(chip->data_buffer + pos, 0, count); memset(chip->data_buffer + pos, 0, count);
chip->buffer_end = chip->data_buffer + pos + count; chip->buffer_end = chip->data_buffer + pos + count;
if (chip->empty) { if (chip->empty) {
@ -211,7 +211,6 @@ static const struct snd_pcm_ops snd_sh_dac_pcm_ops = {
.pointer = snd_sh_dac_pcm_pointer, .pointer = snd_sh_dac_pcm_pointer,
.copy = snd_sh_dac_pcm_copy, .copy = snd_sh_dac_pcm_copy,
.fill_silence = snd_sh_dac_pcm_silence, .fill_silence = snd_sh_dac_pcm_silence,
.mmap = snd_pcm_lib_mmap_iomem,
}; };
static int snd_sh_dac_pcm(struct snd_sh_dac *chip, int device) static int snd_sh_dac_pcm(struct snd_sh_dac *chip, int device)