Commit 86940651 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: isa: 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-8-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2251612e
...@@ -633,7 +633,6 @@ int snd_ad1816a_create(struct snd_card *card, ...@@ -633,7 +633,6 @@ int snd_ad1816a_create(struct snd_card *card,
static const struct snd_pcm_ops snd_ad1816a_playback_ops = { static const struct snd_pcm_ops snd_ad1816a_playback_ops = {
.open = snd_ad1816a_playback_open, .open = snd_ad1816a_playback_open,
.close = snd_ad1816a_playback_close, .close = snd_ad1816a_playback_close,
.ioctl = snd_pcm_lib_ioctl,
.prepare = snd_ad1816a_playback_prepare, .prepare = snd_ad1816a_playback_prepare,
.trigger = snd_ad1816a_playback_trigger, .trigger = snd_ad1816a_playback_trigger,
.pointer = snd_ad1816a_playback_pointer, .pointer = snd_ad1816a_playback_pointer,
...@@ -642,7 +641,6 @@ static const struct snd_pcm_ops snd_ad1816a_playback_ops = { ...@@ -642,7 +641,6 @@ static const struct snd_pcm_ops snd_ad1816a_playback_ops = {
static const struct snd_pcm_ops snd_ad1816a_capture_ops = { static const struct snd_pcm_ops snd_ad1816a_capture_ops = {
.open = snd_ad1816a_capture_open, .open = snd_ad1816a_capture_open,
.close = snd_ad1816a_capture_close, .close = snd_ad1816a_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.prepare = snd_ad1816a_capture_prepare, .prepare = snd_ad1816a_capture_prepare,
.trigger = snd_ad1816a_capture_trigger, .trigger = snd_ad1816a_capture_trigger,
.pointer = snd_ad1816a_capture_pointer, .pointer = snd_ad1816a_capture_pointer,
......
...@@ -1643,7 +1643,6 @@ static int snd_es18xx_probe(struct snd_es18xx *chip, ...@@ -1643,7 +1643,6 @@ static int snd_es18xx_probe(struct snd_es18xx *chip,
static const struct snd_pcm_ops snd_es18xx_playback_ops = { static const struct snd_pcm_ops snd_es18xx_playback_ops = {
.open = snd_es18xx_playback_open, .open = snd_es18xx_playback_open,
.close = snd_es18xx_playback_close, .close = snd_es18xx_playback_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_es18xx_playback_hw_params, .hw_params = snd_es18xx_playback_hw_params,
.prepare = snd_es18xx_playback_prepare, .prepare = snd_es18xx_playback_prepare,
.trigger = snd_es18xx_playback_trigger, .trigger = snd_es18xx_playback_trigger,
...@@ -1653,7 +1652,6 @@ static const struct snd_pcm_ops snd_es18xx_playback_ops = { ...@@ -1653,7 +1652,6 @@ static const struct snd_pcm_ops snd_es18xx_playback_ops = {
static const struct snd_pcm_ops snd_es18xx_capture_ops = { static const struct snd_pcm_ops snd_es18xx_capture_ops = {
.open = snd_es18xx_capture_open, .open = snd_es18xx_capture_open,
.close = snd_es18xx_capture_close, .close = snd_es18xx_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_es18xx_capture_hw_params, .hw_params = snd_es18xx_capture_hw_params,
.prepare = snd_es18xx_capture_prepare, .prepare = snd_es18xx_capture_prepare,
.trigger = snd_es18xx_capture_trigger, .trigger = snd_es18xx_capture_trigger,
......
...@@ -821,7 +821,6 @@ static const struct snd_kcontrol_new snd_gf1_pcm_volume_control1 = ...@@ -821,7 +821,6 @@ static const struct snd_kcontrol_new snd_gf1_pcm_volume_control1 =
static const struct snd_pcm_ops snd_gf1_pcm_playback_ops = { static const struct snd_pcm_ops snd_gf1_pcm_playback_ops = {
.open = snd_gf1_pcm_playback_open, .open = snd_gf1_pcm_playback_open,
.close = snd_gf1_pcm_playback_close, .close = snd_gf1_pcm_playback_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_gf1_pcm_playback_hw_params, .hw_params = snd_gf1_pcm_playback_hw_params,
.hw_free = snd_gf1_pcm_playback_hw_free, .hw_free = snd_gf1_pcm_playback_hw_free,
.prepare = snd_gf1_pcm_playback_prepare, .prepare = snd_gf1_pcm_playback_prepare,
...@@ -835,7 +834,6 @@ static const struct snd_pcm_ops snd_gf1_pcm_playback_ops = { ...@@ -835,7 +834,6 @@ static const struct snd_pcm_ops snd_gf1_pcm_playback_ops = {
static const struct snd_pcm_ops snd_gf1_pcm_capture_ops = { static const struct snd_pcm_ops snd_gf1_pcm_capture_ops = {
.open = snd_gf1_pcm_capture_open, .open = snd_gf1_pcm_capture_open,
.close = snd_gf1_pcm_capture_close, .close = snd_gf1_pcm_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_gf1_pcm_capture_hw_params, .hw_params = snd_gf1_pcm_capture_hw_params,
.prepare = snd_gf1_pcm_capture_prepare, .prepare = snd_gf1_pcm_capture_prepare,
.trigger = snd_gf1_pcm_capture_trigger, .trigger = snd_gf1_pcm_capture_trigger,
......
...@@ -562,7 +562,6 @@ snd_msnd_playback_pointer(struct snd_pcm_substream *substream) ...@@ -562,7 +562,6 @@ snd_msnd_playback_pointer(struct snd_pcm_substream *substream)
static const struct snd_pcm_ops snd_msnd_playback_ops = { static const struct snd_pcm_ops snd_msnd_playback_ops = {
.open = snd_msnd_playback_open, .open = snd_msnd_playback_open,
.close = snd_msnd_playback_close, .close = snd_msnd_playback_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_msnd_playback_hw_params, .hw_params = snd_msnd_playback_hw_params,
.prepare = snd_msnd_playback_prepare, .prepare = snd_msnd_playback_prepare,
.trigger = snd_msnd_playback_trigger, .trigger = snd_msnd_playback_trigger,
...@@ -659,7 +658,6 @@ static int snd_msnd_capture_hw_params(struct snd_pcm_substream *substream, ...@@ -659,7 +658,6 @@ static int snd_msnd_capture_hw_params(struct snd_pcm_substream *substream,
static const struct snd_pcm_ops snd_msnd_capture_ops = { static const struct snd_pcm_ops snd_msnd_capture_ops = {
.open = snd_msnd_capture_open, .open = snd_msnd_capture_open,
.close = snd_msnd_capture_close, .close = snd_msnd_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_msnd_capture_hw_params, .hw_params = snd_msnd_capture_hw_params,
.prepare = snd_msnd_capture_prepare, .prepare = snd_msnd_capture_prepare,
.trigger = snd_msnd_capture_trigger, .trigger = snd_msnd_capture_trigger,
......
...@@ -660,7 +660,6 @@ static snd_pcm_uframes_t emu8k_pcm_pointer(struct snd_pcm_substream *subs) ...@@ -660,7 +660,6 @@ static snd_pcm_uframes_t emu8k_pcm_pointer(struct snd_pcm_substream *subs)
static const struct snd_pcm_ops emu8k_pcm_ops = { static const struct snd_pcm_ops emu8k_pcm_ops = {
.open = emu8k_pcm_open, .open = emu8k_pcm_open,
.close = emu8k_pcm_close, .close = emu8k_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = emu8k_pcm_hw_params, .hw_params = emu8k_pcm_hw_params,
.hw_free = emu8k_pcm_hw_free, .hw_free = emu8k_pcm_hw_free,
.prepare = emu8k_pcm_prepare, .prepare = emu8k_pcm_prepare,
......
...@@ -817,7 +817,6 @@ int snd_sb16dsp_configure(struct snd_sb * chip) ...@@ -817,7 +817,6 @@ int snd_sb16dsp_configure(struct snd_sb * chip)
static const struct snd_pcm_ops snd_sb16_playback_ops = { static const struct snd_pcm_ops snd_sb16_playback_ops = {
.open = snd_sb16_playback_open, .open = snd_sb16_playback_open,
.close = snd_sb16_playback_close, .close = snd_sb16_playback_close,
.ioctl = snd_pcm_lib_ioctl,
.prepare = snd_sb16_playback_prepare, .prepare = snd_sb16_playback_prepare,
.trigger = snd_sb16_playback_trigger, .trigger = snd_sb16_playback_trigger,
.pointer = snd_sb16_playback_pointer, .pointer = snd_sb16_playback_pointer,
...@@ -826,7 +825,6 @@ static const struct snd_pcm_ops snd_sb16_playback_ops = { ...@@ -826,7 +825,6 @@ static const struct snd_pcm_ops snd_sb16_playback_ops = {
static const struct snd_pcm_ops snd_sb16_capture_ops = { static const struct snd_pcm_ops snd_sb16_capture_ops = {
.open = snd_sb16_capture_open, .open = snd_sb16_capture_open,
.close = snd_sb16_capture_close, .close = snd_sb16_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.prepare = snd_sb16_capture_prepare, .prepare = snd_sb16_capture_prepare,
.trigger = snd_sb16_capture_trigger, .trigger = snd_sb16_capture_trigger,
.pointer = snd_sb16_capture_pointer, .pointer = snd_sb16_capture_pointer,
......
...@@ -546,7 +546,6 @@ static int snd_sb8_close(struct snd_pcm_substream *substream) ...@@ -546,7 +546,6 @@ static int snd_sb8_close(struct snd_pcm_substream *substream)
static const struct snd_pcm_ops snd_sb8_playback_ops = { static const struct snd_pcm_ops snd_sb8_playback_ops = {
.open = snd_sb8_open, .open = snd_sb8_open,
.close = snd_sb8_close, .close = snd_sb8_close,
.ioctl = snd_pcm_lib_ioctl,
.prepare = snd_sb8_playback_prepare, .prepare = snd_sb8_playback_prepare,
.trigger = snd_sb8_playback_trigger, .trigger = snd_sb8_playback_trigger,
.pointer = snd_sb8_playback_pointer, .pointer = snd_sb8_playback_pointer,
...@@ -555,7 +554,6 @@ static const struct snd_pcm_ops snd_sb8_playback_ops = { ...@@ -555,7 +554,6 @@ static const struct snd_pcm_ops snd_sb8_playback_ops = {
static const struct snd_pcm_ops snd_sb8_capture_ops = { static const struct snd_pcm_ops snd_sb8_capture_ops = {
.open = snd_sb8_open, .open = snd_sb8_open,
.close = snd_sb8_close, .close = snd_sb8_close,
.ioctl = snd_pcm_lib_ioctl,
.prepare = snd_sb8_capture_prepare, .prepare = snd_sb8_capture_prepare,
.trigger = snd_sb8_capture_trigger, .trigger = snd_sb8_capture_trigger,
.pointer = snd_sb8_capture_pointer, .pointer = snd_sb8_capture_pointer,
......
...@@ -1871,7 +1871,6 @@ EXPORT_SYMBOL(snd_wss_create); ...@@ -1871,7 +1871,6 @@ EXPORT_SYMBOL(snd_wss_create);
static const struct snd_pcm_ops snd_wss_playback_ops = { static const struct snd_pcm_ops snd_wss_playback_ops = {
.open = snd_wss_playback_open, .open = snd_wss_playback_open,
.close = snd_wss_playback_close, .close = snd_wss_playback_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_wss_playback_hw_params, .hw_params = snd_wss_playback_hw_params,
.prepare = snd_wss_playback_prepare, .prepare = snd_wss_playback_prepare,
.trigger = snd_wss_trigger, .trigger = snd_wss_trigger,
...@@ -1881,7 +1880,6 @@ static const struct snd_pcm_ops snd_wss_playback_ops = { ...@@ -1881,7 +1880,6 @@ static const struct snd_pcm_ops snd_wss_playback_ops = {
static const struct snd_pcm_ops snd_wss_capture_ops = { static const struct snd_pcm_ops snd_wss_capture_ops = {
.open = snd_wss_capture_open, .open = snd_wss_capture_open,
.close = snd_wss_capture_close, .close = snd_wss_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_wss_capture_hw_params, .hw_params = snd_wss_capture_hw_params,
.prepare = snd_wss_capture_prepare, .prepare = snd_wss_capture_prepare,
.trigger = snd_wss_trigger, .trigger = snd_wss_trigger,
......
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