| Message ID | 20191210061145.24641-6-tiwai@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ALSA: Drop superfluous ioctl PCM ops (for 5.6) | expand |
Hi, On Tue, Dec 10, 2019 at 07:11:27AM +0100, Takashi Iwai wrote: > Signed-off-by: Takashi Iwai <tiwai@suse.de> > --- > sound/firewire/bebob/bebob_pcm.c | 2 -- > sound/firewire/dice/dice-pcm.c | 2 -- > sound/firewire/digi00x/digi00x-pcm.c | 2 -- > sound/firewire/fireface/ff-pcm.c | 2 -- > sound/firewire/fireworks/fireworks_pcm.c | 2 -- > sound/firewire/isight.c | 1 - > sound/firewire/motu/motu-pcm.c | 2 -- > sound/firewire/oxfw/oxfw-pcm.c | 2 -- > sound/firewire/tascam/tascam-pcm.c | 2 -- > 9 files changed, 17 deletions(-) I understand that this patch is based on the below commit: * fc033cbf6fb7("ALSA: pcm: Allow NULL ioctl ops")[1] All of the changes are fine to me. Acked-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> [1] https://mailman.alsa-project.org/pipermail/alsa-devel/2019-November/158692.html Regards Takashi Sakamoto
On Tue, 10 Dec 2019 16:49:28 +0100, Takashi Sakamoto wrote: > > Hi, > > On Tue, Dec 10, 2019 at 07:11:27AM +0100, Takashi Iwai wrote: > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > --- > > sound/firewire/bebob/bebob_pcm.c | 2 -- > > sound/firewire/dice/dice-pcm.c | 2 -- > > sound/firewire/digi00x/digi00x-pcm.c | 2 -- > > sound/firewire/fireface/ff-pcm.c | 2 -- > > sound/firewire/fireworks/fireworks_pcm.c | 2 -- > > sound/firewire/isight.c | 1 - > > sound/firewire/motu/motu-pcm.c | 2 -- > > sound/firewire/oxfw/oxfw-pcm.c | 2 -- > > sound/firewire/tascam/tascam-pcm.c | 2 -- > > 9 files changed, 17 deletions(-) > > I understand that this patch is based on the below commit: > * fc033cbf6fb7("ALSA: pcm: Allow NULL ioctl ops")[1] > > All of the changes are fine to me. > > Acked-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> > > [1] https://mailman.alsa-project.org/pipermail/alsa-devel/2019-November/158692.html Thanks. It's good idea to put the background information. I'll add it to the changelog. Actually I seem to have forgotten to fill the changelog text in this commit. Below is the revised patch to be committed. Takashi -- 8< -- Subject: [PATCH] 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>
On Tue, Dec 10, 2019 at 04:58:37PM +0100, Takashi Iwai wrote: > On Tue, 10 Dec 2019 16:49:28 +0100, > Takashi Sakamoto wrote: > > > > Hi, > > > > On Tue, Dec 10, 2019 at 07:11:27AM +0100, Takashi Iwai wrote: > > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > > --- > > > sound/firewire/bebob/bebob_pcm.c | 2 -- > > > sound/firewire/dice/dice-pcm.c | 2 -- > > > sound/firewire/digi00x/digi00x-pcm.c | 2 -- > > > sound/firewire/fireface/ff-pcm.c | 2 -- > > > sound/firewire/fireworks/fireworks_pcm.c | 2 -- > > > sound/firewire/isight.c | 1 - > > > sound/firewire/motu/motu-pcm.c | 2 -- > > > sound/firewire/oxfw/oxfw-pcm.c | 2 -- > > > sound/firewire/tascam/tascam-pcm.c | 2 -- > > > 9 files changed, 17 deletions(-) > > > > I understand that this patch is based on the below commit: > > * fc033cbf6fb7("ALSA: pcm: Allow NULL ioctl ops")[1] > > > > All of the changes are fine to me. > > > > Acked-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> > > > > [1] https://mailman.alsa-project.org/pipermail/alsa-devel/2019-November/158692.html > > Thanks. It's good idea to put the background information. I'll add > it to the changelog. > > Actually I seem to have forgotten to fill the changelog text in this > commit. Below is the revised patch to be committed. > > > Takashi > > -- 8< -- > Subject: [PATCH] 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> It's preferrable. Thanks for your extra work ;) Thanks Takashi Sakamoto
diff --git a/sound/firewire/bebob/bebob_pcm.c b/sound/firewire/bebob/bebob_pcm.c index 5fbf1d74c544..f8d9a2041264 100644 --- 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 2700f7f6f754..af8a90ee40f3 100644 --- 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 bacf9b860f3f..b7f6eda09f9f 100644 --- 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 a52a4344ec6f..f978cc2fed7d 100644 --- 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 8e60d22acbcc..980580dfbb39 100644 --- 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 214f77b0e8b7..6655af53b367 100644 --- 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 931978eb30c9..2d41a1a4052c 100644 --- 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 974e53bbae10..2dfa7e179cb6 100644 --- 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 92551ca3460c..36c1353f2494 100644 --- 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,
Signed-off-by: Takashi Iwai <tiwai@suse.de> --- sound/firewire/bebob/bebob_pcm.c | 2 -- sound/firewire/dice/dice-pcm.c | 2 -- sound/firewire/digi00x/digi00x-pcm.c | 2 -- sound/firewire/fireface/ff-pcm.c | 2 -- sound/firewire/fireworks/fireworks_pcm.c | 2 -- sound/firewire/isight.c | 1 - sound/firewire/motu/motu-pcm.c | 2 -- sound/firewire/oxfw/oxfw-pcm.c | 2 -- sound/firewire/tascam/tascam-pcm.c | 2 -- 9 files changed, 17 deletions(-)