ALSA: sparc: Drop superfluous ioctl PCM ops
authorTakashi Iwai <tiwai@suse.de>
Tue, 10 Dec 2019 06:11:41 +0000 (07:11 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 11 Dec 2019 06:25:33 +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-20-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/sparc/amd7930.c
sound/sparc/cs4231.c
sound/sparc/dbri.c

index d399736..df1b16c 100644 (file)
@@ -726,7 +726,6 @@ static int snd_amd7930_capture_close(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops snd_amd7930_playback_ops = {
        .open           =       snd_amd7930_playback_open,
        .close          =       snd_amd7930_playback_close,
-       .ioctl          =       snd_pcm_lib_ioctl,
        .prepare        =       snd_amd7930_playback_prepare,
        .trigger        =       snd_amd7930_playback_trigger,
        .pointer        =       snd_amd7930_playback_pointer,
@@ -735,7 +734,6 @@ static const struct snd_pcm_ops snd_amd7930_playback_ops = {
 static const struct snd_pcm_ops snd_amd7930_capture_ops = {
        .open           =       snd_amd7930_capture_open,
        .close          =       snd_amd7930_capture_close,
-       .ioctl          =       snd_pcm_lib_ioctl,
        .prepare        =       snd_amd7930_capture_prepare,
        .trigger        =       snd_amd7930_capture_trigger,
        .pointer        =       snd_amd7930_capture_pointer,
index 874da94..1676d44 100644 (file)
@@ -1193,7 +1193,6 @@ static int snd_cs4231_capture_close(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops snd_cs4231_playback_ops = {
        .open           =       snd_cs4231_playback_open,
        .close          =       snd_cs4231_playback_close,
-       .ioctl          =       snd_pcm_lib_ioctl,
        .hw_params      =       snd_cs4231_playback_hw_params,
        .prepare        =       snd_cs4231_playback_prepare,
        .trigger        =       snd_cs4231_trigger,
@@ -1203,7 +1202,6 @@ static const struct snd_pcm_ops snd_cs4231_playback_ops = {
 static const struct snd_pcm_ops snd_cs4231_capture_ops = {
        .open           =       snd_cs4231_capture_open,
        .close          =       snd_cs4231_capture_close,
-       .ioctl          =       snd_pcm_lib_ioctl,
        .hw_params      =       snd_cs4231_capture_hw_params,
        .prepare        =       snd_cs4231_capture_prepare,
        .trigger        =       snd_cs4231_trigger,
index 315d5a0..1390a52 100644 (file)
@@ -2215,7 +2215,6 @@ static snd_pcm_uframes_t snd_dbri_pointer(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops snd_dbri_ops = {
        .open = snd_dbri_open,
        .close = snd_dbri_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .hw_params = snd_dbri_hw_params,
        .hw_free = snd_dbri_hw_free,
        .prepare = snd_dbri_prepare,