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

Commit 6769e988 authored by Julia Lawall's avatar Julia Lawall Committed by Takashi Iwai
Browse files

ALSA: constify snd_pcm_ops structures 

Check for snd_pcm_ops structures that are only stored in the ops field of a
snd_soc_platform_driver structure or passed as the third argument to
snd_pcm_set_ops.  The corresponding field or parameter is declared const,
so snd_pcm_ops structures that have this property can be declared as const
also.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@r disable optional_qualifier@
identifier i;
position p;
@@
static struct snd_pcm_ops i@p = { ... };

@ok1@
identifier r.i;
struct snd_soc_platform_driver e;
position p;
@@
e.ops = &i@p;

@ok2@
identifier r.i;
expression e1, e2;
position p;
@@
snd_pcm_set_ops(e1, e2, &i@p)

@bad@
position p != {r.p,ok1.p,ok2.p};
identifier r.i;
struct snd_pcm_ops e;
@@
e@i@p

@depends on !bad disable optional_qualifier@
identifier r.i;
@@
static
+const
 struct snd_pcm_ops i = { ... };
// </smpl>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9d5262ae

sound/pci/als300.c

+2 −2
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static snd_pcm_uframes_t snd_als300_pointer(struct snd_pcm_substream *substream) 
	return bytes_to_frames(substream->runtime, current_ptr);

}



static struct snd_pcm_ops snd_als300_playback_ops = {

static const struct snd_pcm_ops snd_als300_playback_ops = {

	.open =		snd_als300_playback_open,

	.close =	snd_als300_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,
@@ -574,7 +574,7 @@ static struct snd_pcm_ops snd_als300_playback_ops = { 
	.pointer =	snd_als300_pointer,

};



static struct snd_pcm_ops snd_als300_capture_ops = {

static const struct snd_pcm_ops snd_als300_capture_ops = {

	.open =		snd_als300_capture_open,

	.close =	snd_als300_capture_close,

	.ioctl =	snd_pcm_lib_ioctl,

sound/pci/als4000.c

+2 −2
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ static int snd_als4000_capture_close(struct snd_pcm_substream *substream) 


/******************************************************************/



static struct snd_pcm_ops snd_als4000_playback_ops = {

static const struct snd_pcm_ops snd_als4000_playback_ops = {

	.open =		snd_als4000_playback_open,

	.close =	snd_als4000_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,
@@ -683,7 +683,7 @@ static struct snd_pcm_ops snd_als4000_playback_ops = { 
	.pointer =	snd_als4000_playback_pointer

};



static struct snd_pcm_ops snd_als4000_capture_ops = {

static const struct snd_pcm_ops snd_als4000_capture_ops = {

	.open =		snd_als4000_capture_open,

	.close =	snd_als4000_capture_close,

	.ioctl =	snd_pcm_lib_ioctl,

sound/pci/asihpi/asihpi.c

+2 −2
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ static int snd_card_asihpi_playback_close(struct snd_pcm_substream *substream) 
	return 0;

}



static struct snd_pcm_ops snd_card_asihpi_playback_mmap_ops = {

static const struct snd_pcm_ops snd_card_asihpi_playback_mmap_ops = {

	.open = snd_card_asihpi_playback_open,

	.close = snd_card_asihpi_playback_close,

	.ioctl = snd_card_asihpi_playback_ioctl,
@@ -1305,7 +1305,7 @@ static int snd_card_asihpi_capture_close(struct snd_pcm_substream *substream) 
	return 0;

}



static struct snd_pcm_ops snd_card_asihpi_capture_mmap_ops = {

static const struct snd_pcm_ops snd_card_asihpi_capture_mmap_ops = {

	.open = snd_card_asihpi_capture_open,

	.close = snd_card_asihpi_capture_close,

	.ioctl = snd_card_asihpi_capture_ioctl,

sound/pci/atiixp.c

+3 −3
Original line number Diff line number Diff line
@@ -1148,7 +1148,7 @@ static int snd_atiixp_spdif_close(struct snd_pcm_substream *substream) 
}



/* AC97 playback */

static struct snd_pcm_ops snd_atiixp_playback_ops = {

static const struct snd_pcm_ops snd_atiixp_playback_ops = {

	.open =		snd_atiixp_playback_open,

	.close =	snd_atiixp_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,
@@ -1160,7 +1160,7 @@ static struct snd_pcm_ops snd_atiixp_playback_ops = { 
};



/* AC97 capture */

static struct snd_pcm_ops snd_atiixp_capture_ops = {

static const struct snd_pcm_ops snd_atiixp_capture_ops = {

	.open =		snd_atiixp_capture_open,

	.close =	snd_atiixp_capture_close,

	.ioctl =	snd_pcm_lib_ioctl,
@@ -1172,7 +1172,7 @@ static struct snd_pcm_ops snd_atiixp_capture_ops = { 
};



/* SPDIF playback */

static struct snd_pcm_ops snd_atiixp_spdif_ops = {

static const struct snd_pcm_ops snd_atiixp_spdif_ops = {

	.open =		snd_atiixp_spdif_open,

	.close =	snd_atiixp_spdif_close,

	.ioctl =	snd_pcm_lib_ioctl,

sound/pci/atiixp_modem.c

+2 −2
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ static int snd_atiixp_capture_close(struct snd_pcm_substream *substream) 




/* AC97 playback */

static struct snd_pcm_ops snd_atiixp_playback_ops = {

static const struct snd_pcm_ops snd_atiixp_playback_ops = {

	.open =		snd_atiixp_playback_open,

	.close =	snd_atiixp_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,
@@ -959,7 +959,7 @@ static struct snd_pcm_ops snd_atiixp_playback_ops = { 
};



/* AC97 capture */

static struct snd_pcm_ops snd_atiixp_capture_ops = {

static const struct snd_pcm_ops snd_atiixp_capture_ops = {

	.open =		snd_atiixp_capture_open,

	.close =	snd_atiixp_capture_close,

	.ioctl =	snd_pcm_lib_ioctl,