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: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/r/20191121190709.29121-2-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
10a9594563
commit
3b1c952c95
|
@ -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.close = dpcm_fe_dai_close;
|
||||
rtd->ops.pointer = soc_pcm_pointer;
|
||||
rtd->ops.ioctl = snd_soc_pcm_component_ioctl;
|
||||
} else {
|
||||
rtd->ops.open = soc_pcm_open;
|
||||
rtd->ops.hw_params = soc_pcm_hw_params;
|
||||
|
@ -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.close = soc_pcm_close;
|
||||
rtd->ops.pointer = soc_pcm_pointer;
|
||||
rtd->ops.ioctl = snd_soc_pcm_component_ioctl;
|
||||
}
|
||||
|
||||
for_each_rtd_components(rtd, rtdcom, component) {
|
||||
const struct snd_soc_component_driver *drv = component->driver;
|
||||
|
||||
if (drv->ioctl)
|
||||
rtd->ops.ioctl = snd_soc_pcm_component_ioctl;
|
||||
if (drv->copy_user)
|
||||
rtd->ops.copy_user = snd_soc_pcm_component_copy_user;
|
||||
if (drv->page)
|
||||
|
|
Loading…
Reference in a new issue