ALSA: isa: Drop superfluous ioctl PCM ops

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-8-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index adc35051c5e990c3c348bb989e7a4287beaefc1e..b9d340c752b4e17d6bc3b0d7e665d111515651f5 100644 (file)
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -633,7 +633,6 @@ int snd_ad1816a_create(struct snd_card *card,
 static const struct snd_pcm_ops snd_ad1816a_playback_ops = {
        .open =         snd_ad1816a_playback_open,
        .close =        snd_ad1816a_playback_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .prepare =      snd_ad1816a_playback_prepare,
        .trigger =      snd_ad1816a_playback_trigger,
        .pointer =      snd_ad1816a_playback_pointer,
@@ -642,7 +641,6 @@ static const struct snd_pcm_ops snd_ad1816a_playback_ops = {
 static const struct snd_pcm_ops snd_ad1816a_capture_ops = {
        .open =         snd_ad1816a_capture_open,
        .close =        snd_ad1816a_capture_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .prepare =      snd_ad1816a_capture_prepare,
        .trigger =      snd_ad1816a_capture_trigger,
        .pointer =      snd_ad1816a_capture_pointer,

diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 1346447ffe01f91d3473a3c4048a5fb6c17c9c91..87a0a33807e73027f32b11b2af0a7b3017fe2a00 100644 (file)
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -1643,7 +1643,6 @@ static int snd_es18xx_probe(struct snd_es18xx *chip,
 static const struct snd_pcm_ops snd_es18xx_playback_ops = {
        .open =         snd_es18xx_playback_open,
        .close =        snd_es18xx_playback_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_es18xx_playback_hw_params,
        .prepare =      snd_es18xx_playback_prepare,
        .trigger =      snd_es18xx_playback_trigger,
@@ -1653,7 +1652,6 @@ static const struct snd_pcm_ops snd_es18xx_playback_ops = {
 static const struct snd_pcm_ops snd_es18xx_capture_ops = {
        .open =         snd_es18xx_capture_open,
        .close =        snd_es18xx_capture_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_es18xx_capture_hw_params,
        .prepare =      snd_es18xx_capture_prepare,
        .trigger =      snd_es18xx_capture_trigger,

diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
index bd3a54bc4a94cc3b8dc963a980d2e20125077e7d..aca4ab90e5bc5a06cf966616ac1de91e386984f1 100644 (file)
--- a/sound/isa/gus/gus_pcm.c
+++ b/sound/isa/gus/gus_pcm.c
@@ -821,7 +821,6 @@ static const struct snd_kcontrol_new snd_gf1_pcm_volume_control1 =
 static const struct snd_pcm_ops snd_gf1_pcm_playback_ops = {
        .open =         snd_gf1_pcm_playback_open,
        .close =        snd_gf1_pcm_playback_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_gf1_pcm_playback_hw_params,
        .hw_free =      snd_gf1_pcm_playback_hw_free,
        .prepare =      snd_gf1_pcm_playback_prepare,
@@ -835,7 +834,6 @@ static const struct snd_pcm_ops snd_gf1_pcm_playback_ops = {
 static const struct snd_pcm_ops snd_gf1_pcm_capture_ops = {
        .open =         snd_gf1_pcm_capture_open,
        .close =        snd_gf1_pcm_capture_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_gf1_pcm_capture_hw_params,
        .prepare =      snd_gf1_pcm_capture_prepare,
        .trigger =      snd_gf1_pcm_capture_trigger,

diff --git a/sound/isa/msnd/msnd.c b/sound/isa/msnd/msnd.c
index 82d071492201ebad464a38678c38f4fe185edcaf..4fbc22a5bc5ab7a078f56b4d5ca06e6d79d38c51 100644 (file)
--- a/sound/isa/msnd/msnd.c
+++ b/sound/isa/msnd/msnd.c
@@ -562,7 +562,6 @@ snd_msnd_playback_pointer(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops snd_msnd_playback_ops = {
        .open =         snd_msnd_playback_open,
        .close =        snd_msnd_playback_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_msnd_playback_hw_params,
        .prepare =      snd_msnd_playback_prepare,
        .trigger =      snd_msnd_playback_trigger,
@@ -659,7 +658,6 @@ static int snd_msnd_capture_hw_params(struct snd_pcm_substream *substream,
 static const struct snd_pcm_ops snd_msnd_capture_ops = {
        .open =         snd_msnd_capture_open,
        .close =        snd_msnd_capture_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_msnd_capture_hw_params,
        .prepare =      snd_msnd_capture_prepare,
        .trigger =      snd_msnd_capture_trigger,

diff --git a/sound/isa/sb/emu8000_pcm.c b/sound/isa/sb/emu8000_pcm.c
index 83b7ff5e988054d8a34dd4abc21843305e86fc48..e377ac93f37fd6e298516a23b49b41e3c6c61d4e 100644 (file)
--- a/sound/isa/sb/emu8000_pcm.c
+++ b/sound/isa/sb/emu8000_pcm.c
@@ -660,7 +660,6 @@ static snd_pcm_uframes_t emu8k_pcm_pointer(struct snd_pcm_substream *subs)
 static const struct snd_pcm_ops emu8k_pcm_ops = {
        .open =         emu8k_pcm_open,
        .close =        emu8k_pcm_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    emu8k_pcm_hw_params,
        .hw_free =      emu8k_pcm_hw_free,
        .prepare =      emu8k_pcm_prepare,

diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c
index 07ebf2c49443d20a934b80bf604c6c04a74ccae2..38dc1fde25f3cbbe53c754ad87d51cebbe3223cf 100644 (file)
--- a/sound/isa/sb/sb16_main.c
+++ b/sound/isa/sb/sb16_main.c
@@ -817,7 +817,6 @@ int snd_sb16dsp_configure(struct snd_sb * chip)
 static const struct snd_pcm_ops snd_sb16_playback_ops = {
        .open =         snd_sb16_playback_open,
        .close =        snd_sb16_playback_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .prepare =      snd_sb16_playback_prepare,
        .trigger =      snd_sb16_playback_trigger,
        .pointer =      snd_sb16_playback_pointer,
@@ -826,7 +825,6 @@ static const struct snd_pcm_ops snd_sb16_playback_ops = {
 static const struct snd_pcm_ops snd_sb16_capture_ops = {
        .open =         snd_sb16_capture_open,
        .close =        snd_sb16_capture_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .prepare =      snd_sb16_capture_prepare,
        .trigger =      snd_sb16_capture_trigger,
        .pointer =      snd_sb16_capture_pointer,

diff --git a/sound/isa/sb/sb8_main.c b/sound/isa/sb/sb8_main.c
index 5804fa523600d4155433a13bdb5ddc416ec6d067..e33dfe165276bf44f45e34fc0c99b202fe1a4536 100644 (file)
--- a/sound/isa/sb/sb8_main.c
+++ b/sound/isa/sb/sb8_main.c
@@ -546,7 +546,6 @@ static int snd_sb8_close(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops snd_sb8_playback_ops = {
        .open =                 snd_sb8_open,
        .close =                snd_sb8_close,
-       .ioctl =                snd_pcm_lib_ioctl,
        .prepare =              snd_sb8_playback_prepare,
        .trigger =              snd_sb8_playback_trigger,
        .pointer =              snd_sb8_playback_pointer,
@@ -555,7 +554,6 @@ static const struct snd_pcm_ops snd_sb8_playback_ops = {
 static const struct snd_pcm_ops snd_sb8_capture_ops = {
        .open =                 snd_sb8_open,
        .close =                snd_sb8_close,
-       .ioctl =                snd_pcm_lib_ioctl,
        .prepare =              snd_sb8_capture_prepare,
        .trigger =              snd_sb8_capture_trigger,
        .pointer =              snd_sb8_capture_pointer,

diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c
index 0ef89c97ccd22b6da5793e98a85aa6a07b97a346..9114e89117120b2eda596590dafd689cea0492e6 100644 (file)
--- a/sound/isa/wss/wss_lib.c
+++ b/sound/isa/wss/wss_lib.c
@@ -1871,7 +1871,6 @@ EXPORT_SYMBOL(snd_wss_create);
 static const struct snd_pcm_ops snd_wss_playback_ops = {
        .open =         snd_wss_playback_open,
        .close =        snd_wss_playback_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_wss_playback_hw_params,
        .prepare =      snd_wss_playback_prepare,
        .trigger =      snd_wss_trigger,
@@ -1881,7 +1880,6 @@ static const struct snd_pcm_ops snd_wss_playback_ops = {
 static const struct snd_pcm_ops snd_wss_capture_ops = {
        .open =         snd_wss_capture_open,
        .close =        snd_wss_capture_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_wss_capture_hw_params,
        .prepare =      snd_wss_capture_prepare,
        .trigger =      snd_wss_trigger,