Commit d45b3aae authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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 fc033cbf ("ALSA: pcm: Allow NULL ioctl ops")

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


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ae531486

sound/firewire/bebob/bebob_pcm.c

+0 −2
Original line number Diff line number Diff line
@@ -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,

sound/firewire/dice/dice-pcm.c

+0 −2
Original line number Diff line number Diff line
@@ -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,

sound/firewire/digi00x/digi00x-pcm.c

+0 −2
Original line number Diff line number Diff line
@@ -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,

sound/firewire/fireface/ff-pcm.c

+0 −2
Original line number Diff line number Diff line
@@ -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,

sound/firewire/fireworks/fireworks_pcm.c

+0 −2
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE