Commit 9c0d064a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb: Drop superfluous ioctl PCM ops 

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

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

Link: https://lore.kernel.org/r/20191210061145.24641-22-tiwai@suse.de


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

sound/usb/6fire/pcm.c

+0 −1
Original line number Diff line number Diff line
@@ -542,7 +542,6 @@ static snd_pcm_uframes_t usb6fire_pcm_pointer( 
static const struct snd_pcm_ops pcm_ops = {

	.open = usb6fire_pcm_open,

	.close = usb6fire_pcm_close,

	.ioctl = snd_pcm_lib_ioctl,

	.prepare = usb6fire_pcm_prepare,

	.trigger = usb6fire_pcm_trigger,

	.pointer = usb6fire_pcm_pointer,

sound/usb/caiaq/audio.c

+0 −1
Original line number Diff line number Diff line
@@ -321,7 +321,6 @@ unlock: 
static const struct snd_pcm_ops snd_usb_caiaq_ops = {

	.open =		snd_usb_caiaq_substream_open,

	.close =	snd_usb_caiaq_substream_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_free =	snd_usb_caiaq_pcm_hw_free,

	.prepare =	snd_usb_caiaq_pcm_prepare,

	.trigger =	snd_usb_caiaq_pcm_trigger,

sound/usb/hiface/pcm.c

+0 −1
Original line number Diff line number Diff line
@@ -500,7 +500,6 @@ static snd_pcm_uframes_t hiface_pcm_pointer(struct snd_pcm_substream *alsa_sub) 
static const struct snd_pcm_ops pcm_ops = {

	.open = hiface_pcm_open,

	.close = hiface_pcm_close,

	.ioctl = snd_pcm_lib_ioctl,

	.prepare = hiface_pcm_prepare,

	.trigger = hiface_pcm_trigger,

	.pointer = hiface_pcm_pointer,

sound/usb/line6/capture.c

+0 −1
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ static int snd_line6_capture_close(struct snd_pcm_substream *substream) 
const struct snd_pcm_ops snd_line6_capture_ops = {

	.open = snd_line6_capture_open,

	.close = snd_line6_capture_close,

	.ioctl = snd_pcm_lib_ioctl,

	.hw_params = snd_line6_hw_params,

	.hw_free = snd_line6_hw_free,

	.prepare = snd_line6_prepare,

sound/usb/line6/playback.c

+0 −1
Original line number Diff line number Diff line
@@ -392,7 +392,6 @@ static int snd_line6_playback_close(struct snd_pcm_substream *substream) 
const struct snd_pcm_ops snd_line6_playback_ops = {

	.open = snd_line6_playback_open,

	.close = snd_line6_playback_close,

	.ioctl = snd_pcm_lib_ioctl,

	.hw_params = snd_line6_hw_params,

	.hw_free = snd_line6_hw_free,

	.prepare = snd_line6_prepare,

CRA Git | Maintained and supported by SUSTech CRA and CCSE