media: Drop superfluous ioctl PCM ops

PCM core deals the empty ioctl field now as default.
Let's kill the redundant lines.

Cc: Bluecherry Maintainers <maintainers@bluecherrydvr.com>
Cc: Anton Sviridenko <anton@corp.bluecherry.net>
Cc: Andrey Utkin <andrey.utkin@corp.bluecherry.net>
Cc: Ismael Luceno <ismael@iodev.co.uk>
Cc: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/pci/cx23885/cx23885-alsa.c b/drivers/media/pci/cx23885/cx23885-alsa.c
index a8e980c6dacb9de253498dcbd5e897eb80f2ed48..df44ed7393a0250d687834196918ce06133e99d8 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-alsa.c
+++ b/drivers/media/pci/cx23885/cx23885-alsa.c
@@ -495,7 +495,6 @@ static struct page *snd_cx23885_page(struct snd_pcm_substream *substream,
 static const struct snd_pcm_ops snd_cx23885_pcm_ops = {
        .open = snd_cx23885_pcm_open,
        .close = snd_cx23885_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .hw_params = snd_cx23885_hw_params,
        .hw_free = snd_cx23885_hw_free,
        .prepare = snd_cx23885_prepare,

diff --git a/drivers/media/pci/cx25821/cx25821-alsa.c b/drivers/media/pci/cx25821/cx25821-alsa.c
index c2f2d7c782c75256aabde5bec084aa43f5f4384b..301616426d8a1e269ae3a3db8ccc6c1814df6314 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821-alsa.c
+++ b/drivers/media/pci/cx25821/cx25821-alsa.c
@@ -639,7 +639,6 @@ static struct page *snd_cx25821_page(struct snd_pcm_substream *substream,
 static const struct snd_pcm_ops snd_cx25821_pcm_ops = {
        .open = snd_cx25821_pcm_open,
        .close = snd_cx25821_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .hw_params = snd_cx25821_hw_params,
        .hw_free = snd_cx25821_hw_free,
        .prepare = snd_cx25821_prepare,

diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
index e1e71ae293ed3eea80c2d6c4d56ffba0048a0f7e..7d7aceecc9852f7233b1b47339aa31aaf7e42df7 100644 (file)
--- a/drivers/media/pci/cx88/cx88-alsa.c
+++ b/drivers/media/pci/cx88/cx88-alsa.c
@@ -585,7 +585,6 @@ static struct page *snd_cx88_page(struct snd_pcm_substream *substream,
 static const struct snd_pcm_ops snd_cx88_pcm_ops = {
        .open = snd_cx88_pcm_open,
        .close = snd_cx88_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .hw_params = snd_cx88_hw_params,
        .hw_free = snd_cx88_hw_free,
        .prepare = snd_cx88_prepare,

diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c
index 0385127dd7ff9810e0c625685056bbdde97a8721..544ca57eee75caed8a3f5b8e98fa4c997283050e 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-alsa.c
+++ b/drivers/media/pci/saa7134/saa7134-alsa.c
@@ -865,7 +865,6 @@ static struct page *snd_card_saa7134_page(struct snd_pcm_substream *substream,
 static const struct snd_pcm_ops snd_card_saa7134_capture_ops = {
        .open =                 snd_card_saa7134_capture_open,
        .close =                snd_card_saa7134_capture_close,
-       .ioctl =                snd_pcm_lib_ioctl,
        .hw_params =            snd_card_saa7134_hw_params,
        .hw_free =              snd_card_saa7134_hw_free,
        .prepare =              snd_card_saa7134_capture_prepare,

diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
index ca349d44761073fd7fe093663e0799b5acb39a2a..d6d16e8fd997e403fa0a73cc8b1e758fddd62d71 100644 (file)
--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
@@ -259,7 +259,6 @@ static int snd_solo_pcm_copy_kernel(struct snd_pcm_substream *ss, int channel,
 static const struct snd_pcm_ops snd_solo_pcm_ops = {
        .open = snd_solo_pcm_open,
        .close = snd_solo_pcm_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .prepare = snd_solo_pcm_prepare,
        .trigger = snd_solo_pcm_trigger,
        .pointer = snd_solo_pcm_pointer,

diff --git a/drivers/media/pci/tw686x/tw686x-audio.c b/drivers/media/pci/tw686x/tw686x-audio.c
index f5065c72bb28a7c09cace584d6a28fae46adbb6a..54144e23a4870812b4448e69d3bd09563d8646a4 100644 (file)
--- a/drivers/media/pci/tw686x/tw686x-audio.c
+++ b/drivers/media/pci/tw686x/tw686x-audio.c
@@ -258,7 +258,6 @@ static snd_pcm_uframes_t tw686x_pcm_pointer(struct snd_pcm_substream *ss)
 static const struct snd_pcm_ops tw686x_pcm_ops = {
        .open = tw686x_pcm_open,
        .close = tw686x_pcm_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .prepare = tw686x_pcm_prepare,
        .trigger = tw686x_pcm_trigger,
        .pointer = tw686x_pcm_pointer,

diff --git a/drivers/media/usb/cx231xx/cx231xx-audio.c b/drivers/media/usb/cx231xx/cx231xx-audio.c
index d46efea5337075cc601f9433bd914bf34de36eb6..de42db6f6ad11d736a8ab72402b532297aa5579d 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-audio.c
+++ b/drivers/media/usb/cx231xx/cx231xx-audio.c
@@ -551,7 +551,6 @@ static snd_pcm_uframes_t snd_cx231xx_capture_pointer(struct snd_pcm_substream
 static const struct snd_pcm_ops snd_cx231xx_pcm_capture = {
        .open = snd_cx231xx_capture_open,
        .close = snd_cx231xx_pcm_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .prepare = snd_cx231xx_prepare,
        .trigger = snd_cx231xx_capture_trigger,
        .pointer = snd_cx231xx_capture_pointer,

diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c
index a5215fb1d36a5183e008ab2e0dfd5397b9b0713a..6833b5bfe29370f01e026a1d0bb83f1150f21b35 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-audio.c
+++ b/drivers/media/usb/em28xx/em28xx-audio.c
@@ -626,7 +626,6 @@ static int em28xx_cvol_new(struct snd_card *card, struct em28xx *dev,
 static const struct snd_pcm_ops snd_em28xx_pcm_capture = {
        .open      = snd_em28xx_capture_open,
        .close     = snd_em28xx_pcm_close,
-       .ioctl     = snd_pcm_lib_ioctl,
        .prepare   = snd_em28xx_prepare,
        .trigger   = snd_em28xx_capture_trigger,
        .pointer   = snd_em28xx_capture_pointer,

diff --git a/drivers/media/usb/go7007/snd-go7007.c b/drivers/media/usb/go7007/snd-go7007.c
index 7bef8d1c2d7fb0be52cd1f206512ab0aab8a66ae..2ce85ab38db575e9f958b13a5759eb65d9d317d5 100644 (file)
--- a/drivers/media/usb/go7007/snd-go7007.c
+++ b/drivers/media/usb/go7007/snd-go7007.c
@@ -175,7 +175,6 @@ static snd_pcm_uframes_t go7007_snd_pcm_pointer(struct snd_pcm_substream *substr
 static const struct snd_pcm_ops go7007_snd_capture_ops = {
        .open           = go7007_snd_capture_open,
        .close          = go7007_snd_capture_close,
-       .ioctl          = snd_pcm_lib_ioctl,
        .hw_params      = go7007_snd_hw_params,
        .hw_free        = go7007_snd_hw_free,
        .prepare        = go7007_snd_pcm_prepare,

diff --git a/drivers/media/usb/tm6000/tm6000-alsa.c b/drivers/media/usb/tm6000/tm6000-alsa.c
index 2bfa5abc1b49691bf319ad0d098a5df3ae663aec..c26a0ff60a646197af2525018600bcfea23194ed 100644 (file)
--- a/drivers/media/usb/tm6000/tm6000-alsa.c
+++ b/drivers/media/usb/tm6000/tm6000-alsa.c
@@ -306,7 +306,6 @@ static snd_pcm_uframes_t snd_tm6000_pointer(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops snd_tm6000_pcm_ops = {
        .open = snd_tm6000_pcm_open,
        .close = snd_tm6000_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .prepare = snd_tm6000_prepare,
        .trigger = snd_tm6000_card_trigger,
        .pointer = snd_tm6000_pointer,

diff --git a/drivers/media/usb/usbtv/usbtv-audio.c b/drivers/media/usb/usbtv/usbtv-audio.c
index b27009875758d8428c61932b3f1bbc939045ba1e..b57e94fb19770db90c870640489cb778930dfc59 100644 (file)
--- a/drivers/media/usb/usbtv/usbtv-audio.c
+++ b/drivers/media/usb/usbtv/usbtv-audio.c
@@ -312,7 +312,6 @@ static snd_pcm_uframes_t snd_usbtv_pointer(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops snd_usbtv_pcm_ops = {
        .open = snd_usbtv_pcm_open,
        .close = snd_usbtv_pcm_close,
-       .ioctl = snd_pcm_lib_ioctl,
        .prepare = snd_usbtv_prepare,
        .trigger = snd_usbtv_card_trigger,
        .pointer = snd_usbtv_pointer,