Commit ef98a488 authored by Takashi Iwai's avatar Takashi Iwai

ASoC: Name iov_iter argument as iterator instead of buffer

While transitioning ASoC code for iov_iter usages, I kept the argument
name as "buf" as the original code.  But, iov_iter is an iterator, and
using the name "buf" may be misleading: the crucial difference is that
iov_iter can be proceeded after the operation, hence it can't be
passed twice, while a simple "buffer" sounds as if reusable.

To make the usage clearer, rename the argument from "buf" to "iter".
There is no functional changes, just names.

Fixes: 66201cac ("ASoC: component: Add generic PCM copy ops")
Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/CAHk-=wje+VkXjjfVTmK-uJdG_M5=ar14QxAwK+XDiq07k_pzBg@mail.gmail.comReviewed-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230831130457.8180-2-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 69d0fd34
...@@ -139,7 +139,7 @@ struct snd_soc_component_driver { ...@@ -139,7 +139,7 @@ struct snd_soc_component_driver {
struct snd_pcm_audio_tstamp_report *audio_tstamp_report); struct snd_pcm_audio_tstamp_report *audio_tstamp_report);
int (*copy)(struct snd_soc_component *component, int (*copy)(struct snd_soc_component *component,
struct snd_pcm_substream *substream, int channel, struct snd_pcm_substream *substream, int channel,
unsigned long pos, struct iov_iter *buf, unsigned long pos, struct iov_iter *iter,
unsigned long bytes); unsigned long bytes);
struct page *(*page)(struct snd_soc_component *component, struct page *(*page)(struct snd_soc_component *component,
struct snd_pcm_substream *substream, struct snd_pcm_substream *substream,
...@@ -511,7 +511,7 @@ int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream, ...@@ -511,7 +511,7 @@ int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,
int snd_soc_pcm_component_sync_stop(struct snd_pcm_substream *substream); int snd_soc_pcm_component_sync_stop(struct snd_pcm_substream *substream);
int snd_soc_pcm_component_copy(struct snd_pcm_substream *substream, int snd_soc_pcm_component_copy(struct snd_pcm_substream *substream,
int channel, unsigned long pos, int channel, unsigned long pos,
struct iov_iter *buf, unsigned long bytes); struct iov_iter *iter, unsigned long bytes);
struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream, struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,
unsigned long offset); unsigned long offset);
int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream, int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,
......
...@@ -1054,7 +1054,7 @@ int snd_soc_pcm_component_sync_stop(struct snd_pcm_substream *substream) ...@@ -1054,7 +1054,7 @@ int snd_soc_pcm_component_sync_stop(struct snd_pcm_substream *substream)
int snd_soc_pcm_component_copy(struct snd_pcm_substream *substream, int snd_soc_pcm_component_copy(struct snd_pcm_substream *substream,
int channel, unsigned long pos, int channel, unsigned long pos,
struct iov_iter *buf, unsigned long bytes) struct iov_iter *iter, unsigned long bytes)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
struct snd_soc_component *component; struct snd_soc_component *component;
...@@ -1065,7 +1065,7 @@ int snd_soc_pcm_component_copy(struct snd_pcm_substream *substream, ...@@ -1065,7 +1065,7 @@ int snd_soc_pcm_component_copy(struct snd_pcm_substream *substream,
if (component->driver->copy) if (component->driver->copy)
return soc_component_ret(component, return soc_component_ret(component,
component->driver->copy(component, substream, component->driver->copy(component, substream,
channel, pos, buf, bytes)); channel, pos, iter, bytes));
return -EINVAL; return -EINVAL;
} }
......
...@@ -290,7 +290,7 @@ static snd_pcm_uframes_t dmaengine_pcm_pointer( ...@@ -290,7 +290,7 @@ static snd_pcm_uframes_t dmaengine_pcm_pointer(
static int dmaengine_copy(struct snd_soc_component *component, static int dmaengine_copy(struct snd_soc_component *component,
struct snd_pcm_substream *substream, struct snd_pcm_substream *substream,
int channel, unsigned long hwoff, int channel, unsigned long hwoff,
struct iov_iter *buf, unsigned long bytes) struct iov_iter *iter, unsigned long bytes)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct dmaengine_pcm *pcm = soc_component_to_pcm(component); struct dmaengine_pcm *pcm = soc_component_to_pcm(component);
...@@ -302,7 +302,7 @@ static int dmaengine_copy(struct snd_soc_component *component, ...@@ -302,7 +302,7 @@ static int dmaengine_copy(struct snd_soc_component *component,
channel * (runtime->dma_bytes / runtime->channels); channel * (runtime->dma_bytes / runtime->channels);
if (is_playback) if (is_playback)
if (copy_from_iter(dma_ptr, bytes, buf) != bytes) if (copy_from_iter(dma_ptr, bytes, iter) != bytes)
return -EFAULT; return -EFAULT;
if (process) { if (process) {
...@@ -312,7 +312,7 @@ static int dmaengine_copy(struct snd_soc_component *component, ...@@ -312,7 +312,7 @@ static int dmaengine_copy(struct snd_soc_component *component,
} }
if (!is_playback) if (!is_playback)
if (copy_to_iter(dma_ptr, bytes, buf) != bytes) if (copy_to_iter(dma_ptr, bytes, iter) != bytes)
return -EFAULT; return -EFAULT;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment