Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

-17
-2
sound/firewire/bebob/bebob_pcm.c
··· 342 342 static const struct snd_pcm_ops capture_ops = { 343 343 .open = pcm_open, 344 344 .close = pcm_close, 345 - .ioctl = snd_pcm_lib_ioctl, 346 345 .hw_params = pcm_hw_params, 347 346 .hw_free = pcm_hw_free, 348 347 .prepare = pcm_capture_prepare, ··· 352 353 static const struct snd_pcm_ops playback_ops = { 353 354 .open = pcm_open, 354 355 .close = pcm_close, 355 - .ioctl = snd_pcm_lib_ioctl, 356 356 .hw_params = pcm_hw_params, 357 357 .hw_free = pcm_hw_free, 358 358 .prepare = pcm_playback_prepare,
-2
sound/firewire/dice/dice-pcm.c
··· 405 405 static const struct snd_pcm_ops capture_ops = { 406 406 .open = pcm_open, 407 407 .close = pcm_close, 408 - .ioctl = snd_pcm_lib_ioctl, 409 408 .hw_params = pcm_hw_params, 410 409 .hw_free = pcm_hw_free, 411 410 .prepare = capture_prepare, ··· 415 416 static const struct snd_pcm_ops playback_ops = { 416 417 .open = pcm_open, 417 418 .close = pcm_close, 418 - .ioctl = snd_pcm_lib_ioctl, 419 419 .hw_params = pcm_hw_params, 420 420 .hw_free = pcm_hw_free, 421 421 .prepare = playback_prepare,
-2
sound/firewire/digi00x/digi00x-pcm.c
··· 325 325 static const struct snd_pcm_ops capture_ops = { 326 326 .open = pcm_open, 327 327 .close = pcm_close, 328 - .ioctl = snd_pcm_lib_ioctl, 329 328 .hw_params = pcm_hw_params, 330 329 .hw_free = pcm_hw_free, 331 330 .prepare = pcm_capture_prepare, ··· 335 336 static const struct snd_pcm_ops playback_ops = { 336 337 .open = pcm_open, 337 338 .close = pcm_close, 338 - .ioctl = snd_pcm_lib_ioctl, 339 339 .hw_params = pcm_hw_params, 340 340 .hw_free = pcm_hw_free, 341 341 .prepare = pcm_playback_prepare,
-2
sound/firewire/fireface/ff-pcm.c
··· 365 365 static const struct snd_pcm_ops pcm_capture_ops = { 366 366 .open = pcm_open, 367 367 .close = pcm_close, 368 - .ioctl = snd_pcm_lib_ioctl, 369 368 .hw_params = pcm_hw_params, 370 369 .hw_free = pcm_hw_free, 371 370 .prepare = pcm_capture_prepare, ··· 375 376 static const struct snd_pcm_ops pcm_playback_ops = { 376 377 .open = pcm_open, 377 378 .close = pcm_close, 378 - .ioctl = snd_pcm_lib_ioctl, 379 379 .hw_params = pcm_hw_params, 380 380 .hw_free = pcm_hw_free, 381 381 .prepare = pcm_playback_prepare,
-2
sound/firewire/fireworks/fireworks_pcm.c
··· 372 372 static const struct snd_pcm_ops capture_ops = { 373 373 .open = pcm_open, 374 374 .close = pcm_close, 375 - .ioctl = snd_pcm_lib_ioctl, 376 375 .hw_params = pcm_hw_params, 377 376 .hw_free = pcm_hw_free, 378 377 .prepare = pcm_capture_prepare, ··· 382 383 static const struct snd_pcm_ops playback_ops = { 383 384 .open = pcm_open, 384 385 .close = pcm_close, 385 - .ioctl = snd_pcm_lib_ioctl, 386 386 .hw_params = pcm_hw_params, 387 387 .hw_free = pcm_hw_free, 388 388 .prepare = pcm_playback_prepare,
-1
sound/firewire/isight.c
··· 441 441 static const struct snd_pcm_ops ops = { 442 442 .open = isight_open, 443 443 .close = isight_close, 444 - .ioctl = snd_pcm_lib_ioctl, 445 444 .hw_params = isight_hw_params, 446 445 .hw_free = isight_hw_free, 447 446 .prepare = isight_prepare,
-2
sound/firewire/motu/motu-pcm.c
··· 340 340 static const struct snd_pcm_ops capture_ops = { 341 341 .open = pcm_open, 342 342 .close = pcm_close, 343 - .ioctl = snd_pcm_lib_ioctl, 344 343 .hw_params = pcm_hw_params, 345 344 .hw_free = pcm_hw_free, 346 345 .prepare = capture_prepare, ··· 350 351 static const struct snd_pcm_ops playback_ops = { 351 352 .open = pcm_open, 352 353 .close = pcm_close, 353 - .ioctl = snd_pcm_lib_ioctl, 354 354 .hw_params = pcm_hw_params, 355 355 .hw_free = pcm_hw_free, 356 356 .prepare = playback_prepare,
-2
sound/firewire/oxfw/oxfw-pcm.c
··· 411 411 static const struct snd_pcm_ops capture_ops = { 412 412 .open = pcm_open, 413 413 .close = pcm_close, 414 - .ioctl = snd_pcm_lib_ioctl, 415 414 .hw_params = pcm_capture_hw_params, 416 415 .hw_free = pcm_capture_hw_free, 417 416 .prepare = pcm_capture_prepare, ··· 421 422 static const struct snd_pcm_ops playback_ops = { 422 423 .open = pcm_open, 423 424 .close = pcm_close, 424 - .ioctl = snd_pcm_lib_ioctl, 425 425 .hw_params = pcm_playback_hw_params, 426 426 .hw_free = pcm_playback_hw_free, 427 427 .prepare = pcm_playback_prepare,
-2
sound/firewire/tascam/tascam-pcm.c
··· 254 254 static const struct snd_pcm_ops capture_ops = { 255 255 .open = pcm_open, 256 256 .close = pcm_close, 257 - .ioctl = snd_pcm_lib_ioctl, 258 257 .hw_params = pcm_hw_params, 259 258 .hw_free = pcm_hw_free, 260 259 .prepare = pcm_capture_prepare, ··· 264 265 static const struct snd_pcm_ops playback_ops = { 265 266 .open = pcm_open, 266 267 .close = pcm_close, 267 - .ioctl = snd_pcm_lib_ioctl, 268 268 .hw_params = pcm_hw_params, 269 269 .hw_free = pcm_hw_free, 270 270 .prepare = pcm_playback_prepare,