OSDN Git Service

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

index 6fb5695..977cdaf 100644 (file)
@@ -1140,7 +1140,6 @@ static int snd_atiixp_spdif_close(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops snd_atiixp_playback_ops = {
        .open =         snd_atiixp_playback_open,
        .close =        snd_atiixp_playback_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_atiixp_pcm_hw_params,
        .hw_free =      snd_atiixp_pcm_hw_free,
        .prepare =      snd_atiixp_playback_prepare,
@@ -1152,7 +1151,6 @@ static const struct snd_pcm_ops snd_atiixp_playback_ops = {
 static const struct snd_pcm_ops snd_atiixp_capture_ops = {
        .open =         snd_atiixp_capture_open,
        .close =        snd_atiixp_capture_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_atiixp_pcm_hw_params,
        .hw_free =      snd_atiixp_pcm_hw_free,
        .prepare =      snd_atiixp_capture_prepare,
@@ -1164,7 +1162,6 @@ static const struct snd_pcm_ops snd_atiixp_capture_ops = {
 static const struct snd_pcm_ops snd_atiixp_spdif_ops = {
        .open =         snd_atiixp_spdif_open,
        .close =        snd_atiixp_spdif_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_atiixp_pcm_hw_params,
        .hw_free =      snd_atiixp_pcm_hw_free,
        .prepare =      snd_atiixp_spdif_prepare,
index dc40fda..a27ce41 100644 (file)
@@ -932,7 +932,6 @@ static int snd_atiixp_capture_close(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops snd_atiixp_playback_ops = {
        .open =         snd_atiixp_playback_open,
        .close =        snd_atiixp_playback_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_atiixp_pcm_hw_params,
        .hw_free =      snd_atiixp_pcm_hw_free,
        .prepare =      snd_atiixp_playback_prepare,
@@ -944,7 +943,6 @@ static const struct snd_pcm_ops snd_atiixp_playback_ops = {
 static const struct snd_pcm_ops snd_atiixp_capture_ops = {
        .open =         snd_atiixp_capture_open,
        .close =        snd_atiixp_capture_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_atiixp_pcm_hw_params,
        .hw_free =      snd_atiixp_pcm_hw_free,
        .prepare =      snd_atiixp_capture_prepare,