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

diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c
index 706aa3f..7168f1c 100644 (file)
--- a/sound/usb/6fire/pcm.c
+++ b/sound/usb/6fire/pcm.c
@@ -542,7 +542,6 @@ static snd_pcm_uframes_t usb6fire_pcm_pointer(
 static const struct snd_pcm_ops pcm_ops = {
        .open = usb6fire_pcm_open,
        .close = usb6fire_pcm_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .prepare = usb6fire_pcm_prepare,
        .trigger = usb6fire_pcm_trigger,
        .pointer = usb6fire_pcm_pointer,

diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c
index 8513b12..7221215 100644 (file)
--- a/sound/usb/caiaq/audio.c
+++ b/sound/usb/caiaq/audio.c
@@ -321,7 +321,6 @@ unlock:
 static const struct snd_pcm_ops snd_usb_caiaq_ops = {
        .open =         snd_usb_caiaq_substream_open,
        .close =        snd_usb_caiaq_substream_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_free =      snd_usb_caiaq_pcm_hw_free,
        .prepare =      snd_usb_caiaq_pcm_prepare,
        .trigger =      snd_usb_caiaq_pcm_trigger,

diff --git a/sound/usb/hiface/pcm.c b/sound/usb/hiface/pcm.c
index cc0639a..a148caa 100644 (file)
--- a/sound/usb/hiface/pcm.c
+++ b/sound/usb/hiface/pcm.c
@@ -500,7 +500,6 @@ static snd_pcm_uframes_t hiface_pcm_pointer(struct snd_pcm_substream *alsa_sub)
 static const struct snd_pcm_ops pcm_ops = {
        .open = hiface_pcm_open,
        .close = hiface_pcm_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .prepare = hiface_pcm_prepare,
        .trigger = hiface_pcm_trigger,
        .pointer = hiface_pcm_pointer,

diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c
index 82abef3..663d608 100644 (file)
--- a/sound/usb/line6/capture.c
+++ b/sound/usb/line6/capture.c
@@ -247,7 +247,6 @@ static int snd_line6_capture_close(struct snd_pcm_substream *substream)
 const struct snd_pcm_ops snd_line6_capture_ops = {
        .open = snd_line6_capture_open,
        .close = snd_line6_capture_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .hw_params = snd_line6_hw_params,
        .hw_free = snd_line6_hw_free,
        .prepare = snd_line6_prepare,

diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c
index 2e8ead3..01930ce 100644 (file)
--- a/sound/usb/line6/playback.c
+++ b/sound/usb/line6/playback.c
@@ -392,7 +392,6 @@ static int snd_line6_playback_close(struct snd_pcm_substream *substream)
 const struct snd_pcm_ops snd_line6_playback_ops = {
        .open = snd_line6_playback_open,
        .close = snd_line6_playback_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .hw_params = snd_line6_hw_params,
        .hw_free = snd_line6_hw_free,
        .prepare = snd_line6_prepare,

diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c
index a7b6844..884e740 100644 (file)
--- a/sound/usb/misc/ua101.c
+++ b/sound/usb/misc/ua101.c
@@ -870,7 +870,6 @@ static snd_pcm_uframes_t playback_pcm_pointer(struct snd_pcm_substream *subs)
 static const struct snd_pcm_ops capture_pcm_ops = {
        .open = capture_pcm_open,
        .close = capture_pcm_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .hw_params = capture_pcm_hw_params,
        .prepare = capture_pcm_prepare,
        .trigger = capture_pcm_trigger,
@@ -880,7 +879,6 @@ static const struct snd_pcm_ops capture_pcm_ops = {
 static const struct snd_pcm_ops playback_pcm_ops = {
        .open = playback_pcm_open,
        .close = playback_pcm_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .hw_params = playback_pcm_hw_params,
        .prepare = playback_pcm_prepare,
        .trigger = playback_pcm_trigger,

diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 7caaa04..33c1e97 100644 (file)
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -1763,7 +1763,6 @@ static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream
 static const struct snd_pcm_ops snd_usb_playback_ops = {
        .open =         snd_usb_pcm_open,
        .close =        snd_usb_pcm_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_usb_hw_params,
        .hw_free =      snd_usb_hw_free,
        .prepare =      snd_usb_pcm_prepare,
@@ -1774,7 +1773,6 @@ static const struct snd_pcm_ops snd_usb_playback_ops = {
 static const struct snd_pcm_ops snd_usb_capture_ops = {
        .open =         snd_usb_pcm_open,
        .close =        snd_usb_pcm_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_usb_hw_params,
        .hw_free =      snd_usb_hw_free,
        .prepare =      snd_usb_pcm_prepare,

diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index 7eb9805..8ac4ce0 100644 (file)
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -893,7 +893,6 @@ static const struct snd_pcm_ops snd_usX2Y_pcm_ops =
 {
        .open =         snd_usX2Y_pcm_open,
        .close =        snd_usX2Y_pcm_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_usX2Y_pcm_hw_params,
        .hw_free =      snd_usX2Y_pcm_hw_free,
        .prepare =      snd_usX2Y_pcm_prepare,

diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
index 419d9f0..d8d91f2 100644 (file)
--- a/sound/usb/usx2y/usx2yhwdeppcm.c
+++ b/sound/usb/usx2y/usx2yhwdeppcm.c
@@ -581,7 +581,6 @@ static const struct snd_pcm_ops snd_usX2Y_usbpcm_ops =
 {
        .open =         snd_usX2Y_usbpcm_open,
        .close =        snd_usX2Y_usbpcm_close,
-       .ioctl =        snd_pcm_lib_ioctl,
        .hw_params =    snd_usX2Y_pcm_hw_params,
        .hw_free =      snd_usX2Y_usbpcm_hw_free,
        .prepare =      snd_usX2Y_usbpcm_prepare,