From 9fafc5259b430e9f2d3900dc163e9d22a4b56c86 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 10 Dec 2019 07:11:40 +0100
Subject: [PATCH] ALSA: sh: Drop superfluous ioctl PCM ops
Git-commit: 9fafc5259b430e9f2d3900dc163e9d22a4b56c86
Patch-mainline: v5.6-rc1
References: jsc#SLE-16518
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-19-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/sh/aica.c | 1 -
sound/sh/sh_dac_audio.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/sound/sh/aica.c b/sound/sh/aica.c
index 8ff88d71439e..f3cd12ff09c3 100644
--- a/sound/sh/aica.c
+++ b/sound/sh/aica.c
@@ -399,7 +399,6 @@ static unsigned long snd_aicapcm_pcm_pointer(struct snd_pcm_substream
static const struct snd_pcm_ops snd_aicapcm_playback_ops = {
.open = snd_aicapcm_pcm_open,
.close = snd_aicapcm_pcm_close,
- .ioctl = snd_pcm_lib_ioctl,
.prepare = snd_aicapcm_pcm_prepare,
.trigger = snd_aicapcm_pcm_trigger,
.pointer = snd_aicapcm_pcm_pointer,
diff --git a/sound/sh/sh_dac_audio.c b/sound/sh/sh_dac_audio.c
index 1406b50f3f78..b1e171dfe361 100644
--- a/sound/sh/sh_dac_audio.c
+++ b/sound/sh/sh_dac_audio.c
@@ -228,7 +228,6 @@ snd_pcm_uframes_t snd_sh_dac_pcm_pointer(struct snd_pcm_substream *substream)
static const struct snd_pcm_ops snd_sh_dac_pcm_ops = {
.open = snd_sh_dac_pcm_open,
.close = snd_sh_dac_pcm_close,
- .ioctl = snd_pcm_lib_ioctl,
.prepare = snd_sh_dac_pcm_prepare,
.trigger = snd_sh_dac_pcm_trigger,
.pointer = snd_sh_dac_pcm_pointer,
--
2.16.4