Commit 3b1c952c authored by Takashi Iwai's avatar Takashi Iwai

ASoC: pcm: Make ioctl ops optional

Now PCM core accepts the NULL ioctl ops as default, and passing a proper
ioctl ops is no longer mandatory.  Adjust soc_new_pcm() to allow also
the NULL for component ioctl ops, too.
Acked-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20191121190709.29121-2-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 10a95945
...@@ -3005,7 +3005,6 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) ...@@ -3005,7 +3005,6 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
rtd->ops.hw_free = dpcm_fe_dai_hw_free; rtd->ops.hw_free = dpcm_fe_dai_hw_free;
rtd->ops.close = dpcm_fe_dai_close; rtd->ops.close = dpcm_fe_dai_close;
rtd->ops.pointer = soc_pcm_pointer; rtd->ops.pointer = soc_pcm_pointer;
rtd->ops.ioctl = snd_soc_pcm_component_ioctl;
} else { } else {
rtd->ops.open = soc_pcm_open; rtd->ops.open = soc_pcm_open;
rtd->ops.hw_params = soc_pcm_hw_params; rtd->ops.hw_params = soc_pcm_hw_params;
...@@ -3014,12 +3013,13 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) ...@@ -3014,12 +3013,13 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
rtd->ops.hw_free = soc_pcm_hw_free; rtd->ops.hw_free = soc_pcm_hw_free;
rtd->ops.close = soc_pcm_close; rtd->ops.close = soc_pcm_close;
rtd->ops.pointer = soc_pcm_pointer; rtd->ops.pointer = soc_pcm_pointer;
rtd->ops.ioctl = snd_soc_pcm_component_ioctl;
} }
for_each_rtd_components(rtd, rtdcom, component) { for_each_rtd_components(rtd, rtdcom, component) {
const struct snd_soc_component_driver *drv = component->driver; const struct snd_soc_component_driver *drv = component->driver;
if (drv->ioctl)
rtd->ops.ioctl = snd_soc_pcm_component_ioctl;
if (drv->copy_user) if (drv->copy_user)
rtd->ops.copy_user = snd_soc_pcm_component_copy_user; rtd->ops.copy_user = snd_soc_pcm_component_copy_user;
if (drv->page) if (drv->page)
......
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