OSDN Git Service

ALSA: arm: Drop superfluous ioctl PCM ops
authorTakashi Iwai <tiwai@suse.de>
Tue, 10 Dec 2019 06:11:24 +0000 (07:11 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 11 Dec 2019 06:25:26 +0000 (07:25 +0100)
PCM core deals the empty ioctl field now as default(*).
Let's kill the redundant lines.

(*) commit fc033cbf6fb7 ("ALSA: pcm: Allow NULL ioctl ops")

Link: https://lore.kernel.org/r/20191210061145.24641-3-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/arm/aaci.c
sound/arm/pxa2xx-ac97.c

index 1e9ea0f..d1b5dbc 100644 (file)
@@ -625,7 +625,6 @@ static int aaci_pcm_playback_trigger(struct snd_pcm_substream *substream, int cm
 static const struct snd_pcm_ops aaci_playback_ops = {
        .open           = aaci_pcm_open,
        .close          = aaci_pcm_close,
-       .ioctl          = snd_pcm_lib_ioctl,
        .hw_params      = aaci_pcm_hw_params,
        .hw_free        = aaci_pcm_hw_free,
        .prepare        = aaci_pcm_prepare,
@@ -728,7 +727,6 @@ static int aaci_pcm_capture_prepare(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops aaci_capture_ops = {
        .open           = aaci_pcm_open,
        .close          = aaci_pcm_close,
-       .ioctl          = snd_pcm_lib_ioctl,
        .hw_params      = aaci_pcm_hw_params,
        .hw_free        = aaci_pcm_hw_free,
        .prepare        = aaci_pcm_capture_prepare,
index acfaf1d..08ae551 100644 (file)
@@ -173,7 +173,6 @@ static SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops, pxa2xx_ac97_suspend, pxa2xx_ac97_re
 static const struct snd_pcm_ops pxa2xx_ac97_pcm_ops = {
        .open           = pxa2xx_ac97_pcm_open,
        .close          = pxa2xx_ac97_pcm_close,
-       .ioctl          = snd_pcm_lib_ioctl,
        .hw_params      = pxa2xx_pcm_hw_params,
        .hw_free        = pxa2xx_pcm_hw_free,
        .prepare        = pxa2xx_ac97_pcm_prepare,