ALSA: mips: Drop superfluous ioctl PCM ops
authorTakashi Iwai <tiwai@suse.de>
Tue, 10 Dec 2019 06:11:30 +0000 (07:11 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 11 Dec 2019 06:25:28 +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-9-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/mips/hal2.c
sound/mips/sgio2audio.c

index e80ebe5212181cd48fce37d267c74950aed86acb..db44d9d691db37ea8b415782529c788b0620b265 100644 (file)
@@ -684,7 +684,6 @@ static int hal2_capture_ack(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops hal2_playback_ops = {
        .open =        hal2_playback_open,
        .close =       hal2_playback_close,
-       .ioctl =       snd_pcm_lib_ioctl,
        .prepare =     hal2_playback_prepare,
        .trigger =     hal2_playback_trigger,
        .pointer =     hal2_playback_pointer,
@@ -694,7 +693,6 @@ static const struct snd_pcm_ops hal2_playback_ops = {
 static const struct snd_pcm_ops hal2_capture_ops = {
        .open =        hal2_capture_open,
        .close =       hal2_capture_close,
-       .ioctl =       snd_pcm_lib_ioctl,
        .prepare =     hal2_capture_prepare,
        .trigger =     hal2_capture_trigger,
        .pointer =     hal2_capture_pointer,
index 481f5ffff61bcac112142aca0327c407c629be24..f10a08a8777f08957740d0122df0cbb2ec5435b8 100644 (file)
@@ -649,7 +649,6 @@ snd_sgio2audio_pcm_pointer(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops snd_sgio2audio_playback1_ops = {
        .open =        snd_sgio2audio_playback1_open,
        .close =       snd_sgio2audio_pcm_close,
-       .ioctl =       snd_pcm_lib_ioctl,
        .hw_params =   snd_sgio2audio_pcm_hw_params,
        .hw_free =     snd_sgio2audio_pcm_hw_free,
        .prepare =     snd_sgio2audio_pcm_prepare,
@@ -660,7 +659,6 @@ static const struct snd_pcm_ops snd_sgio2audio_playback1_ops = {
 static const struct snd_pcm_ops snd_sgio2audio_playback2_ops = {
        .open =        snd_sgio2audio_playback2_open,
        .close =       snd_sgio2audio_pcm_close,
-       .ioctl =       snd_pcm_lib_ioctl,
        .hw_params =   snd_sgio2audio_pcm_hw_params,
        .hw_free =     snd_sgio2audio_pcm_hw_free,
        .prepare =     snd_sgio2audio_pcm_prepare,
@@ -671,7 +669,6 @@ static const struct snd_pcm_ops snd_sgio2audio_playback2_ops = {
 static const struct snd_pcm_ops snd_sgio2audio_capture_ops = {
        .open =        snd_sgio2audio_capture_open,
        .close =       snd_sgio2audio_pcm_close,
-       .ioctl =       snd_pcm_lib_ioctl,
        .hw_params =   snd_sgio2audio_pcm_hw_params,
        .hw_free =     snd_sgio2audio_pcm_hw_free,
        .prepare =     snd_sgio2audio_pcm_prepare,