Commit 4ab6596a authored by Takashi Iwai's avatar Takashi Iwai

ALSA: intel8x0: 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-11-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c0264468
...@@ -1311,7 +1311,6 @@ static int snd_intel8x0_ali_spdifout_close(struct snd_pcm_substream *substream) ...@@ -1311,7 +1311,6 @@ static int snd_intel8x0_ali_spdifout_close(struct snd_pcm_substream *substream)
static const struct snd_pcm_ops snd_intel8x0_playback_ops = { static const struct snd_pcm_ops snd_intel8x0_playback_ops = {
.open = snd_intel8x0_playback_open, .open = snd_intel8x0_playback_open,
.close = snd_intel8x0_playback_close, .close = snd_intel8x0_playback_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_intel8x0_hw_params, .hw_params = snd_intel8x0_hw_params,
.hw_free = snd_intel8x0_hw_free, .hw_free = snd_intel8x0_hw_free,
.prepare = snd_intel8x0_pcm_prepare, .prepare = snd_intel8x0_pcm_prepare,
...@@ -1322,7 +1321,6 @@ static const struct snd_pcm_ops snd_intel8x0_playback_ops = { ...@@ -1322,7 +1321,6 @@ static const struct snd_pcm_ops snd_intel8x0_playback_ops = {
static const struct snd_pcm_ops snd_intel8x0_capture_ops = { static const struct snd_pcm_ops snd_intel8x0_capture_ops = {
.open = snd_intel8x0_capture_open, .open = snd_intel8x0_capture_open,
.close = snd_intel8x0_capture_close, .close = snd_intel8x0_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_intel8x0_hw_params, .hw_params = snd_intel8x0_hw_params,
.hw_free = snd_intel8x0_hw_free, .hw_free = snd_intel8x0_hw_free,
.prepare = snd_intel8x0_pcm_prepare, .prepare = snd_intel8x0_pcm_prepare,
...@@ -1333,7 +1331,6 @@ static const struct snd_pcm_ops snd_intel8x0_capture_ops = { ...@@ -1333,7 +1331,6 @@ static const struct snd_pcm_ops snd_intel8x0_capture_ops = {
static const struct snd_pcm_ops snd_intel8x0_capture_mic_ops = { static const struct snd_pcm_ops snd_intel8x0_capture_mic_ops = {
.open = snd_intel8x0_mic_open, .open = snd_intel8x0_mic_open,
.close = snd_intel8x0_mic_close, .close = snd_intel8x0_mic_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_intel8x0_hw_params, .hw_params = snd_intel8x0_hw_params,
.hw_free = snd_intel8x0_hw_free, .hw_free = snd_intel8x0_hw_free,
.prepare = snd_intel8x0_pcm_prepare, .prepare = snd_intel8x0_pcm_prepare,
...@@ -1344,7 +1341,6 @@ static const struct snd_pcm_ops snd_intel8x0_capture_mic_ops = { ...@@ -1344,7 +1341,6 @@ static const struct snd_pcm_ops snd_intel8x0_capture_mic_ops = {
static const struct snd_pcm_ops snd_intel8x0_capture_mic2_ops = { static const struct snd_pcm_ops snd_intel8x0_capture_mic2_ops = {
.open = snd_intel8x0_mic2_open, .open = snd_intel8x0_mic2_open,
.close = snd_intel8x0_mic2_close, .close = snd_intel8x0_mic2_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_intel8x0_hw_params, .hw_params = snd_intel8x0_hw_params,
.hw_free = snd_intel8x0_hw_free, .hw_free = snd_intel8x0_hw_free,
.prepare = snd_intel8x0_pcm_prepare, .prepare = snd_intel8x0_pcm_prepare,
...@@ -1355,7 +1351,6 @@ static const struct snd_pcm_ops snd_intel8x0_capture_mic2_ops = { ...@@ -1355,7 +1351,6 @@ static const struct snd_pcm_ops snd_intel8x0_capture_mic2_ops = {
static const struct snd_pcm_ops snd_intel8x0_capture2_ops = { static const struct snd_pcm_ops snd_intel8x0_capture2_ops = {
.open = snd_intel8x0_capture2_open, .open = snd_intel8x0_capture2_open,
.close = snd_intel8x0_capture2_close, .close = snd_intel8x0_capture2_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_intel8x0_hw_params, .hw_params = snd_intel8x0_hw_params,
.hw_free = snd_intel8x0_hw_free, .hw_free = snd_intel8x0_hw_free,
.prepare = snd_intel8x0_pcm_prepare, .prepare = snd_intel8x0_pcm_prepare,
...@@ -1366,7 +1361,6 @@ static const struct snd_pcm_ops snd_intel8x0_capture2_ops = { ...@@ -1366,7 +1361,6 @@ static const struct snd_pcm_ops snd_intel8x0_capture2_ops = {
static const struct snd_pcm_ops snd_intel8x0_spdif_ops = { static const struct snd_pcm_ops snd_intel8x0_spdif_ops = {
.open = snd_intel8x0_spdif_open, .open = snd_intel8x0_spdif_open,
.close = snd_intel8x0_spdif_close, .close = snd_intel8x0_spdif_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_intel8x0_hw_params, .hw_params = snd_intel8x0_hw_params,
.hw_free = snd_intel8x0_hw_free, .hw_free = snd_intel8x0_hw_free,
.prepare = snd_intel8x0_pcm_prepare, .prepare = snd_intel8x0_pcm_prepare,
...@@ -1377,7 +1371,6 @@ static const struct snd_pcm_ops snd_intel8x0_spdif_ops = { ...@@ -1377,7 +1371,6 @@ static const struct snd_pcm_ops snd_intel8x0_spdif_ops = {
static const struct snd_pcm_ops snd_intel8x0_ali_playback_ops = { static const struct snd_pcm_ops snd_intel8x0_ali_playback_ops = {
.open = snd_intel8x0_playback_open, .open = snd_intel8x0_playback_open,
.close = snd_intel8x0_playback_close, .close = snd_intel8x0_playback_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_intel8x0_hw_params, .hw_params = snd_intel8x0_hw_params,
.hw_free = snd_intel8x0_hw_free, .hw_free = snd_intel8x0_hw_free,
.prepare = snd_intel8x0_pcm_prepare, .prepare = snd_intel8x0_pcm_prepare,
...@@ -1388,7 +1381,6 @@ static const struct snd_pcm_ops snd_intel8x0_ali_playback_ops = { ...@@ -1388,7 +1381,6 @@ static const struct snd_pcm_ops snd_intel8x0_ali_playback_ops = {
static const struct snd_pcm_ops snd_intel8x0_ali_capture_ops = { static const struct snd_pcm_ops snd_intel8x0_ali_capture_ops = {
.open = snd_intel8x0_capture_open, .open = snd_intel8x0_capture_open,
.close = snd_intel8x0_capture_close, .close = snd_intel8x0_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_intel8x0_hw_params, .hw_params = snd_intel8x0_hw_params,
.hw_free = snd_intel8x0_hw_free, .hw_free = snd_intel8x0_hw_free,
.prepare = snd_intel8x0_pcm_prepare, .prepare = snd_intel8x0_pcm_prepare,
...@@ -1399,7 +1391,6 @@ static const struct snd_pcm_ops snd_intel8x0_ali_capture_ops = { ...@@ -1399,7 +1391,6 @@ static const struct snd_pcm_ops snd_intel8x0_ali_capture_ops = {
static const struct snd_pcm_ops snd_intel8x0_ali_capture_mic_ops = { static const struct snd_pcm_ops snd_intel8x0_ali_capture_mic_ops = {
.open = snd_intel8x0_mic_open, .open = snd_intel8x0_mic_open,
.close = snd_intel8x0_mic_close, .close = snd_intel8x0_mic_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_intel8x0_hw_params, .hw_params = snd_intel8x0_hw_params,
.hw_free = snd_intel8x0_hw_free, .hw_free = snd_intel8x0_hw_free,
.prepare = snd_intel8x0_pcm_prepare, .prepare = snd_intel8x0_pcm_prepare,
...@@ -1410,7 +1401,6 @@ static const struct snd_pcm_ops snd_intel8x0_ali_capture_mic_ops = { ...@@ -1410,7 +1401,6 @@ static const struct snd_pcm_ops snd_intel8x0_ali_capture_mic_ops = {
static const struct snd_pcm_ops snd_intel8x0_ali_ac97spdifout_ops = { static const struct snd_pcm_ops snd_intel8x0_ali_ac97spdifout_ops = {
.open = snd_intel8x0_ali_ac97spdifout_open, .open = snd_intel8x0_ali_ac97spdifout_open,
.close = snd_intel8x0_ali_ac97spdifout_close, .close = snd_intel8x0_ali_ac97spdifout_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_intel8x0_hw_params, .hw_params = snd_intel8x0_hw_params,
.hw_free = snd_intel8x0_hw_free, .hw_free = snd_intel8x0_hw_free,
.prepare = snd_intel8x0_pcm_prepare, .prepare = snd_intel8x0_pcm_prepare,
...@@ -1422,7 +1412,6 @@ static const struct snd_pcm_ops snd_intel8x0_ali_ac97spdifout_ops = { ...@@ -1422,7 +1412,6 @@ static const struct snd_pcm_ops snd_intel8x0_ali_ac97spdifout_ops = {
static struct snd_pcm_ops snd_intel8x0_ali_spdifin_ops = { static struct snd_pcm_ops snd_intel8x0_ali_spdifin_ops = {
.open = snd_intel8x0_ali_spdifin_open, .open = snd_intel8x0_ali_spdifin_open,
.close = snd_intel8x0_ali_spdifin_close, .close = snd_intel8x0_ali_spdifin_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_intel8x0_hw_params, .hw_params = snd_intel8x0_hw_params,
.hw_free = snd_intel8x0_hw_free, .hw_free = snd_intel8x0_hw_free,
.prepare = snd_intel8x0_pcm_prepare, .prepare = snd_intel8x0_pcm_prepare,
...@@ -1433,7 +1422,6 @@ static struct snd_pcm_ops snd_intel8x0_ali_spdifin_ops = { ...@@ -1433,7 +1422,6 @@ static struct snd_pcm_ops snd_intel8x0_ali_spdifin_ops = {
static struct snd_pcm_ops snd_intel8x0_ali_spdifout_ops = { static struct snd_pcm_ops snd_intel8x0_ali_spdifout_ops = {
.open = snd_intel8x0_ali_spdifout_open, .open = snd_intel8x0_ali_spdifout_open,
.close = snd_intel8x0_ali_spdifout_close, .close = snd_intel8x0_ali_spdifout_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_intel8x0_hw_params, .hw_params = snd_intel8x0_hw_params,
.hw_free = snd_intel8x0_hw_free, .hw_free = snd_intel8x0_hw_free,
.prepare = snd_intel8x0_pcm_prepare, .prepare = snd_intel8x0_pcm_prepare,
......
...@@ -662,7 +662,6 @@ static int snd_intel8x0m_capture_close(struct snd_pcm_substream *substream) ...@@ -662,7 +662,6 @@ static int snd_intel8x0m_capture_close(struct snd_pcm_substream *substream)
static const struct snd_pcm_ops snd_intel8x0m_playback_ops = { static const struct snd_pcm_ops snd_intel8x0m_playback_ops = {
.open = snd_intel8x0m_playback_open, .open = snd_intel8x0m_playback_open,
.close = snd_intel8x0m_playback_close, .close = snd_intel8x0m_playback_close,
.ioctl = snd_pcm_lib_ioctl,
.prepare = snd_intel8x0m_pcm_prepare, .prepare = snd_intel8x0m_pcm_prepare,
.trigger = snd_intel8x0m_pcm_trigger, .trigger = snd_intel8x0m_pcm_trigger,
.pointer = snd_intel8x0m_pcm_pointer, .pointer = snd_intel8x0m_pcm_pointer,
...@@ -671,7 +670,6 @@ static const struct snd_pcm_ops snd_intel8x0m_playback_ops = { ...@@ -671,7 +670,6 @@ static const struct snd_pcm_ops snd_intel8x0m_playback_ops = {
static const struct snd_pcm_ops snd_intel8x0m_capture_ops = { static const struct snd_pcm_ops snd_intel8x0m_capture_ops = {
.open = snd_intel8x0m_capture_open, .open = snd_intel8x0m_capture_open,
.close = snd_intel8x0m_capture_close, .close = snd_intel8x0m_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.prepare = snd_intel8x0m_pcm_prepare, .prepare = snd_intel8x0m_pcm_prepare,
.trigger = snd_intel8x0m_pcm_trigger, .trigger = snd_intel8x0m_pcm_trigger,
.pointer = snd_intel8x0m_pcm_pointer, .pointer = snd_intel8x0m_pcm_pointer,
......
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