Commit 64395f83 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: via82xx: 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-12-tiwai@suse.de


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

sound/pci/via82xx.c

+0 −5
Original line number Diff line number Diff line
@@ -1348,7 +1348,6 @@ static int snd_via8233_playback_close(struct snd_pcm_substream *substream) 
static const struct snd_pcm_ops snd_via686_playback_ops = {

	.open =		snd_via686_playback_open,

	.close =	snd_via82xx_pcm_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_via82xx_hw_params,

	.hw_free =	snd_via82xx_hw_free,

	.prepare =	snd_via686_playback_prepare,
@@ -1360,7 +1359,6 @@ static const struct snd_pcm_ops snd_via686_playback_ops = { 
static const struct snd_pcm_ops snd_via686_capture_ops = {

	.open =		snd_via82xx_capture_open,

	.close =	snd_via82xx_pcm_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_via82xx_hw_params,

	.hw_free =	snd_via82xx_hw_free,

	.prepare =	snd_via686_capture_prepare,
@@ -1372,7 +1370,6 @@ static const struct snd_pcm_ops snd_via686_capture_ops = { 
static const struct snd_pcm_ops snd_via8233_playback_ops = {

	.open =		snd_via8233_playback_open,

	.close =	snd_via8233_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_via82xx_hw_params,

	.hw_free =	snd_via82xx_hw_free,

	.prepare =	snd_via8233_playback_prepare,
@@ -1384,7 +1381,6 @@ static const struct snd_pcm_ops snd_via8233_playback_ops = { 
static const struct snd_pcm_ops snd_via8233_multi_ops = {

	.open =		snd_via8233_multi_open,

	.close =	snd_via82xx_pcm_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_via82xx_hw_params,

	.hw_free =	snd_via82xx_hw_free,

	.prepare =	snd_via8233_multi_prepare,
@@ -1396,7 +1392,6 @@ static const struct snd_pcm_ops snd_via8233_multi_ops = { 
static const struct snd_pcm_ops snd_via8233_capture_ops = {

	.open =		snd_via82xx_capture_open,

	.close =	snd_via82xx_pcm_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_via82xx_hw_params,

	.hw_free =	snd_via82xx_hw_free,

	.prepare =	snd_via8233_capture_prepare,

sound/pci/via82xx_modem.c

+0 −2
Original line number Diff line number Diff line
@@ -791,7 +791,6 @@ static int snd_via82xx_pcm_close(struct snd_pcm_substream *substream) 
static const struct snd_pcm_ops snd_via686_playback_ops = {

	.open =		snd_via82xx_playback_open,

	.close =	snd_via82xx_pcm_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_via82xx_hw_params,

	.hw_free =	snd_via82xx_hw_free,

	.prepare =	snd_via82xx_pcm_prepare,
@@ -803,7 +802,6 @@ static const struct snd_pcm_ops snd_via686_playback_ops = { 
static const struct snd_pcm_ops snd_via686_capture_ops = {

	.open =		snd_via82xx_capture_open,

	.close =	snd_via82xx_pcm_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_via82xx_hw_params,

	.hw_free =	snd_via82xx_hw_free,

	.prepare =	snd_via82xx_pcm_prepare,

CRA Git | Maintained and supported by SUSTech CRA and CCSE