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

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.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6bddc9ef
...@@ -542,7 +542,6 @@ static snd_pcm_uframes_t usb6fire_pcm_pointer( ...@@ -542,7 +542,6 @@ static snd_pcm_uframes_t usb6fire_pcm_pointer(
static const struct snd_pcm_ops pcm_ops = { static const struct snd_pcm_ops pcm_ops = {
.open = usb6fire_pcm_open, .open = usb6fire_pcm_open,
.close = usb6fire_pcm_close, .close = usb6fire_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
.prepare = usb6fire_pcm_prepare, .prepare = usb6fire_pcm_prepare,
.trigger = usb6fire_pcm_trigger, .trigger = usb6fire_pcm_trigger,
.pointer = usb6fire_pcm_pointer, .pointer = usb6fire_pcm_pointer,
......
...@@ -321,7 +321,6 @@ snd_usb_caiaq_pcm_pointer(struct snd_pcm_substream *sub) ...@@ -321,7 +321,6 @@ snd_usb_caiaq_pcm_pointer(struct snd_pcm_substream *sub)
static const struct snd_pcm_ops snd_usb_caiaq_ops = { static const struct snd_pcm_ops snd_usb_caiaq_ops = {
.open = snd_usb_caiaq_substream_open, .open = snd_usb_caiaq_substream_open,
.close = snd_usb_caiaq_substream_close, .close = snd_usb_caiaq_substream_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_free = snd_usb_caiaq_pcm_hw_free, .hw_free = snd_usb_caiaq_pcm_hw_free,
.prepare = snd_usb_caiaq_pcm_prepare, .prepare = snd_usb_caiaq_pcm_prepare,
.trigger = snd_usb_caiaq_pcm_trigger, .trigger = snd_usb_caiaq_pcm_trigger,
......
...@@ -500,7 +500,6 @@ static snd_pcm_uframes_t hiface_pcm_pointer(struct snd_pcm_substream *alsa_sub) ...@@ -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 = { static const struct snd_pcm_ops pcm_ops = {
.open = hiface_pcm_open, .open = hiface_pcm_open,
.close = hiface_pcm_close, .close = hiface_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
.prepare = hiface_pcm_prepare, .prepare = hiface_pcm_prepare,
.trigger = hiface_pcm_trigger, .trigger = hiface_pcm_trigger,
.pointer = hiface_pcm_pointer, .pointer = hiface_pcm_pointer,
......
...@@ -247,7 +247,6 @@ static int snd_line6_capture_close(struct snd_pcm_substream *substream) ...@@ -247,7 +247,6 @@ static int snd_line6_capture_close(struct snd_pcm_substream *substream)
const struct snd_pcm_ops snd_line6_capture_ops = { const struct snd_pcm_ops snd_line6_capture_ops = {
.open = snd_line6_capture_open, .open = snd_line6_capture_open,
.close = snd_line6_capture_close, .close = snd_line6_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_line6_hw_params, .hw_params = snd_line6_hw_params,
.hw_free = snd_line6_hw_free, .hw_free = snd_line6_hw_free,
.prepare = snd_line6_prepare, .prepare = snd_line6_prepare,
......
...@@ -392,7 +392,6 @@ static int snd_line6_playback_close(struct snd_pcm_substream *substream) ...@@ -392,7 +392,6 @@ static int snd_line6_playback_close(struct snd_pcm_substream *substream)
const struct snd_pcm_ops snd_line6_playback_ops = { const struct snd_pcm_ops snd_line6_playback_ops = {
.open = snd_line6_playback_open, .open = snd_line6_playback_open,
.close = snd_line6_playback_close, .close = snd_line6_playback_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_line6_hw_params, .hw_params = snd_line6_hw_params,
.hw_free = snd_line6_hw_free, .hw_free = snd_line6_hw_free,
.prepare = snd_line6_prepare, .prepare = snd_line6_prepare,
......
...@@ -870,7 +870,6 @@ static snd_pcm_uframes_t playback_pcm_pointer(struct snd_pcm_substream *subs) ...@@ -870,7 +870,6 @@ static snd_pcm_uframes_t playback_pcm_pointer(struct snd_pcm_substream *subs)
static const struct snd_pcm_ops capture_pcm_ops = { static const struct snd_pcm_ops capture_pcm_ops = {
.open = capture_pcm_open, .open = capture_pcm_open,
.close = capture_pcm_close, .close = capture_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = capture_pcm_hw_params, .hw_params = capture_pcm_hw_params,
.prepare = capture_pcm_prepare, .prepare = capture_pcm_prepare,
.trigger = capture_pcm_trigger, .trigger = capture_pcm_trigger,
...@@ -880,7 +879,6 @@ static const struct snd_pcm_ops capture_pcm_ops = { ...@@ -880,7 +879,6 @@ static const struct snd_pcm_ops capture_pcm_ops = {
static const struct snd_pcm_ops playback_pcm_ops = { static const struct snd_pcm_ops playback_pcm_ops = {
.open = playback_pcm_open, .open = playback_pcm_open,
.close = playback_pcm_close, .close = playback_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = playback_pcm_hw_params, .hw_params = playback_pcm_hw_params,
.prepare = playback_pcm_prepare, .prepare = playback_pcm_prepare,
.trigger = playback_pcm_trigger, .trigger = playback_pcm_trigger,
......
...@@ -1763,7 +1763,6 @@ static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream ...@@ -1763,7 +1763,6 @@ static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream
static const struct snd_pcm_ops snd_usb_playback_ops = { static const struct snd_pcm_ops snd_usb_playback_ops = {
.open = snd_usb_pcm_open, .open = snd_usb_pcm_open,
.close = snd_usb_pcm_close, .close = snd_usb_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_usb_hw_params, .hw_params = snd_usb_hw_params,
.hw_free = snd_usb_hw_free, .hw_free = snd_usb_hw_free,
.prepare = snd_usb_pcm_prepare, .prepare = snd_usb_pcm_prepare,
...@@ -1774,7 +1773,6 @@ static const struct snd_pcm_ops snd_usb_playback_ops = { ...@@ -1774,7 +1773,6 @@ static const struct snd_pcm_ops snd_usb_playback_ops = {
static const struct snd_pcm_ops snd_usb_capture_ops = { static const struct snd_pcm_ops snd_usb_capture_ops = {
.open = snd_usb_pcm_open, .open = snd_usb_pcm_open,
.close = snd_usb_pcm_close, .close = snd_usb_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_usb_hw_params, .hw_params = snd_usb_hw_params,
.hw_free = snd_usb_hw_free, .hw_free = snd_usb_hw_free,
.prepare = snd_usb_pcm_prepare, .prepare = snd_usb_pcm_prepare,
......
...@@ -893,7 +893,6 @@ static const struct snd_pcm_ops snd_usX2Y_pcm_ops = ...@@ -893,7 +893,6 @@ static const struct snd_pcm_ops snd_usX2Y_pcm_ops =
{ {
.open = snd_usX2Y_pcm_open, .open = snd_usX2Y_pcm_open,
.close = snd_usX2Y_pcm_close, .close = snd_usX2Y_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_usX2Y_pcm_hw_params, .hw_params = snd_usX2Y_pcm_hw_params,
.hw_free = snd_usX2Y_pcm_hw_free, .hw_free = snd_usX2Y_pcm_hw_free,
.prepare = snd_usX2Y_pcm_prepare, .prepare = snd_usX2Y_pcm_prepare,
......
...@@ -581,7 +581,6 @@ static const struct snd_pcm_ops snd_usX2Y_usbpcm_ops = ...@@ -581,7 +581,6 @@ static const struct snd_pcm_ops snd_usX2Y_usbpcm_ops =
{ {
.open = snd_usX2Y_usbpcm_open, .open = snd_usX2Y_usbpcm_open,
.close = snd_usX2Y_usbpcm_close, .close = snd_usX2Y_usbpcm_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_usX2Y_pcm_hw_params, .hw_params = snd_usX2Y_pcm_hw_params,
.hw_free = snd_usX2Y_usbpcm_hw_free, .hw_free = snd_usX2Y_usbpcm_hw_free,
.prepare = snd_usX2Y_usbpcm_prepare, .prepare = snd_usX2Y_usbpcm_prepare,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment