ALSA: firewire: Drop superfluous ioctl PCM ops

All the PCM ioctl ops of ALSA FireWire drivers do nothing but calling
the default handler.

Now PCM core accepts NULL as the default ioctl ops(*), so let's drop
altogether.

(*) commit fc033cbf6fb7 ("ALSA: pcm: Allow NULL ioctl ops")

Acked-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20191210061145.24641-6-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/bebob/bebob_pcm.c b/sound/firewire/bebob/bebob_pcm.c
index 5fbf1d74c544f65c04c9ddbca0e06e20c5b19f06..f8d9a2041264d9c102824218d02f139e45a65636 100644 (file)
--- a/sound/firewire/bebob/bebob_pcm.c
+++ b/sound/firewire/bebob/bebob_pcm.c
@@ -342,7 +342,6 @@ int snd_bebob_create_pcm_devices(struct snd_bebob *bebob)
        static const struct snd_pcm_ops capture_ops = {
                .open           = pcm_open,
                .close          = pcm_close,
-               .ioctl          = snd_pcm_lib_ioctl,
                .hw_params      = pcm_hw_params,
                .hw_free        = pcm_hw_free,
                .prepare        = pcm_capture_prepare,
@@ -353,7 +352,6 @@ int snd_bebob_create_pcm_devices(struct snd_bebob *bebob)
        static const struct snd_pcm_ops playback_ops = {
                .open           = pcm_open,
                .close          = pcm_close,
-               .ioctl          = snd_pcm_lib_ioctl,
                .hw_params      = pcm_hw_params,
                .hw_free        = pcm_hw_free,
                .prepare        = pcm_playback_prepare,

diff --git a/sound/firewire/dice/dice-pcm.c b/sound/firewire/dice/dice-pcm.c
index 2700f7f6f754f3ea3bd5ca0a80d4a8f3f26828da..af8a90ee40f395adb5e7c2dbefae9684d2110e80 100644 (file)
--- a/sound/firewire/dice/dice-pcm.c
+++ b/sound/firewire/dice/dice-pcm.c
@@ -405,7 +405,6 @@ int snd_dice_create_pcm(struct snd_dice *dice)
        static const struct snd_pcm_ops capture_ops = {
                .open      = pcm_open,
                .close     = pcm_close,
-               .ioctl     = snd_pcm_lib_ioctl,
                .hw_params = pcm_hw_params,
                .hw_free   = pcm_hw_free,
                .prepare   = capture_prepare,
@@ -416,7 +415,6 @@ int snd_dice_create_pcm(struct snd_dice *dice)
        static const struct snd_pcm_ops playback_ops = {
                .open      = pcm_open,
                .close     = pcm_close,
-               .ioctl     = snd_pcm_lib_ioctl,
                .hw_params = pcm_hw_params,
                .hw_free   = pcm_hw_free,
                .prepare   = playback_prepare,

diff --git a/sound/firewire/digi00x/digi00x-pcm.c b/sound/firewire/digi00x/digi00x-pcm.c
index bacf9b860f3fa28d3578be269a50228b297e95fc..b7f6eda09f9f7a444530b190f273c02b05319ff3 100644 (file)
--- a/sound/firewire/digi00x/digi00x-pcm.c
+++ b/sound/firewire/digi00x/digi00x-pcm.c
@@ -325,7 +325,6 @@ int snd_dg00x_create_pcm_devices(struct snd_dg00x *dg00x)
        static const struct snd_pcm_ops capture_ops = {
                .open           = pcm_open,
                .close          = pcm_close,
-               .ioctl          = snd_pcm_lib_ioctl,
                .hw_params      = pcm_hw_params,
                .hw_free        = pcm_hw_free,
                .prepare        = pcm_capture_prepare,
@@ -336,7 +335,6 @@ int snd_dg00x_create_pcm_devices(struct snd_dg00x *dg00x)
        static const struct snd_pcm_ops playback_ops = {
                .open           = pcm_open,
                .close          = pcm_close,
-               .ioctl          = snd_pcm_lib_ioctl,
                .hw_params      = pcm_hw_params,
                .hw_free        = pcm_hw_free,
                .prepare        = pcm_playback_prepare,

diff --git a/sound/firewire/fireface/ff-pcm.c b/sound/firewire/fireface/ff-pcm.c
index a52a4344ec6f59876b61bec37a456367458faaf8..f978cc2fed7dd5cec0fa99753f32a5f26d5fa794 100644 (file)
--- a/sound/firewire/fireface/ff-pcm.c
+++ b/sound/firewire/fireface/ff-pcm.c
@@ -365,7 +365,6 @@ int snd_ff_create_pcm_devices(struct snd_ff *ff)
        static const struct snd_pcm_ops pcm_capture_ops = {
                .open           = pcm_open,
                .close          = pcm_close,
-               .ioctl          = snd_pcm_lib_ioctl,
                .hw_params      = pcm_hw_params,
                .hw_free        = pcm_hw_free,
                .prepare        = pcm_capture_prepare,
@@ -376,7 +375,6 @@ int snd_ff_create_pcm_devices(struct snd_ff *ff)
        static const struct snd_pcm_ops pcm_playback_ops = {
                .open           = pcm_open,
                .close          = pcm_close,
-               .ioctl          = snd_pcm_lib_ioctl,
                .hw_params      = pcm_hw_params,
                .hw_free        = pcm_hw_free,
                .prepare        = pcm_playback_prepare,

diff --git a/sound/firewire/fireworks/fireworks_pcm.c b/sound/firewire/fireworks/fireworks_pcm.c
index 8e60d22acbccd6e88bda51d69387df5311ab6459..980580dfbb39e7467b1e1f50464d1c3a27490ba3 100644 (file)
--- a/sound/firewire/fireworks/fireworks_pcm.c
+++ b/sound/firewire/fireworks/fireworks_pcm.c
@@ -372,7 +372,6 @@ int snd_efw_create_pcm_devices(struct snd_efw *efw)
        static const struct snd_pcm_ops capture_ops = {
                .open           = pcm_open,
                .close          = pcm_close,
-               .ioctl          = snd_pcm_lib_ioctl,
                .hw_params      = pcm_hw_params,
                .hw_free        = pcm_hw_free,
                .prepare        = pcm_capture_prepare,
@@ -383,7 +382,6 @@ int snd_efw_create_pcm_devices(struct snd_efw *efw)
        static const struct snd_pcm_ops playback_ops = {
                .open           = pcm_open,
                .close          = pcm_close,
-               .ioctl          = snd_pcm_lib_ioctl,
                .hw_params      = pcm_hw_params,
                .hw_free        = pcm_hw_free,
                .prepare        = pcm_playback_prepare,

diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
index 214f77b0e8b784d4d77b3642990d040d945f77c5..6655af53b3675686cfb28b5facbe8c3517d91a38 100644 (file)
--- a/sound/firewire/isight.c
+++ b/sound/firewire/isight.c
@@ -441,7 +441,6 @@ static int isight_create_pcm(struct isight *isight)
        static const struct snd_pcm_ops ops = {
                .open      = isight_open,
                .close     = isight_close,
-               .ioctl     = snd_pcm_lib_ioctl,
                .hw_params = isight_hw_params,
                .hw_free   = isight_hw_free,
                .prepare   = isight_prepare,

diff --git a/sound/firewire/motu/motu-pcm.c b/sound/firewire/motu/motu-pcm.c
index 931978eb30c919625f6bb0c90d06ab959a1a0d4d..2d41a1a4052c9d45fcf94719d0b3c16c7b6b6338 100644 (file)
--- a/sound/firewire/motu/motu-pcm.c
+++ b/sound/firewire/motu/motu-pcm.c
@@ -340,7 +340,6 @@ int snd_motu_create_pcm_devices(struct snd_motu *motu)
        static const struct snd_pcm_ops capture_ops = {
                .open      = pcm_open,
                .close     = pcm_close,
-               .ioctl     = snd_pcm_lib_ioctl,
                .hw_params = pcm_hw_params,
                .hw_free   = pcm_hw_free,
                .prepare   = capture_prepare,
@@ -351,7 +350,6 @@ int snd_motu_create_pcm_devices(struct snd_motu *motu)
        static const struct snd_pcm_ops playback_ops = {
                .open      = pcm_open,
                .close     = pcm_close,
-               .ioctl     = snd_pcm_lib_ioctl,
                .hw_params = pcm_hw_params,
                .hw_free   = pcm_hw_free,
                .prepare   = playback_prepare,

diff --git a/sound/firewire/oxfw/oxfw-pcm.c b/sound/firewire/oxfw/oxfw-pcm.c
index 974e53bbae10a1ea084d16e78777e9c2f7292e8d..2dfa7e179cb6a56e7c1c7f976f67f6142e21f0a5 100644 (file)
--- a/sound/firewire/oxfw/oxfw-pcm.c
+++ b/sound/firewire/oxfw/oxfw-pcm.c
@@ -411,7 +411,6 @@ int snd_oxfw_create_pcm(struct snd_oxfw *oxfw)
        static const struct snd_pcm_ops capture_ops = {
                .open      = pcm_open,
                .close     = pcm_close,
-               .ioctl     = snd_pcm_lib_ioctl,
                .hw_params = pcm_capture_hw_params,
                .hw_free   = pcm_capture_hw_free,
                .prepare   = pcm_capture_prepare,
@@ -422,7 +421,6 @@ int snd_oxfw_create_pcm(struct snd_oxfw *oxfw)
        static const struct snd_pcm_ops playback_ops = {
                .open      = pcm_open,
                .close     = pcm_close,
-               .ioctl     = snd_pcm_lib_ioctl,
                .hw_params = pcm_playback_hw_params,
                .hw_free   = pcm_playback_hw_free,
                .prepare   = pcm_playback_prepare,

diff --git a/sound/firewire/tascam/tascam-pcm.c b/sound/firewire/tascam/tascam-pcm.c
index 92551ca3460ccb351593723aca860937baba39e7..36c1353f249489adf5721b68610933065212e8fc 100644 (file)
--- a/sound/firewire/tascam/tascam-pcm.c
+++ b/sound/firewire/tascam/tascam-pcm.c
@@ -254,7 +254,6 @@ int snd_tscm_create_pcm_devices(struct snd_tscm *tscm)
        static const struct snd_pcm_ops capture_ops = {
                .open           = pcm_open,
                .close          = pcm_close,
-               .ioctl          = snd_pcm_lib_ioctl,
                .hw_params      = pcm_hw_params,
                .hw_free        = pcm_hw_free,
                .prepare        = pcm_capture_prepare,
@@ -265,7 +264,6 @@ int snd_tscm_create_pcm_devices(struct snd_tscm *tscm)
        static const struct snd_pcm_ops playback_ops = {
                .open           = pcm_open,
                .close          = pcm_close,
-               .ioctl          = snd_pcm_lib_ioctl,
                .hw_params      = pcm_hw_params,
                .hw_free        = pcm_hw_free,
                .prepare        = pcm_playback_prepare,