Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31cb1fb4 authored by Arvind Yadav's avatar Arvind Yadav Committed by Takashi Iwai
Browse files

ALSA: usb: constify snd_pcm_ops structures 



snd_pcm_ops are not supposed to change at runtime. All functions
working with snd_pcm_ops provided by <sound/pcm.h> work with
const snd_pcm_ops. So mark the non-const structs as const.

Signed-off-by: default avatarArvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7a205f5d

sound/usb/6fire/pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static snd_pcm_uframes_t usb6fire_pcm_pointer( 
	return ret;

}



static struct snd_pcm_ops pcm_ops = {

static const struct snd_pcm_ops pcm_ops = {

	.open = usb6fire_pcm_open,

	.close = usb6fire_pcm_close,

	.ioctl = snd_pcm_lib_ioctl,

sound/usb/caiaq/audio.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ snd_usb_caiaq_pcm_pointer(struct snd_pcm_substream *sub) 
}



/* operators for both playback and capture */

static struct snd_pcm_ops snd_usb_caiaq_ops = {

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,

sound/usb/hiface/pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ static snd_pcm_uframes_t hiface_pcm_pointer(struct snd_pcm_substream *alsa_sub) 
	return bytes_to_frames(alsa_sub->runtime, dma_offset);

}



static struct snd_pcm_ops pcm_ops = {

static const struct snd_pcm_ops pcm_ops = {

	.open = hiface_pcm_open,

	.close = hiface_pcm_close,

	.ioctl = snd_pcm_lib_ioctl,

sound/usb/misc/ua101.c

+2 −2
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ static snd_pcm_uframes_t playback_pcm_pointer(struct snd_pcm_substream *subs) 
	return ua101_pcm_pointer(ua, &ua->playback);

}



static struct snd_pcm_ops capture_pcm_ops = {

static const struct snd_pcm_ops capture_pcm_ops = {

	.open = capture_pcm_open,

	.close = capture_pcm_close,

	.ioctl = snd_pcm_lib_ioctl,
@@ -903,7 +903,7 @@ static struct snd_pcm_ops capture_pcm_ops = { 
	.mmap = snd_pcm_lib_mmap_vmalloc,

};



static struct snd_pcm_ops playback_pcm_ops = {

static const struct snd_pcm_ops playback_pcm_ops = {

	.open = playback_pcm_open,

	.close = playback_pcm_close,

	.ioctl = snd_pcm_lib_ioctl,

sound/usb/pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -1690,7 +1690,7 @@ static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream 
	return -EINVAL;

}



static struct snd_pcm_ops snd_usb_playback_ops = {

static const struct snd_pcm_ops snd_usb_playback_ops = {

	.open =		snd_usb_playback_open,

	.close =	snd_usb_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,
@@ -1703,7 +1703,7 @@ static struct snd_pcm_ops snd_usb_playback_ops = { 
	.mmap =		snd_pcm_lib_mmap_vmalloc,

};



static struct snd_pcm_ops snd_usb_capture_ops = {

static const struct snd_pcm_ops snd_usb_capture_ops = {

	.open =		snd_usb_capture_open,

	.close =	snd_usb_capture_close,

	.ioctl =	snd_pcm_lib_ioctl,