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

Commit 665170f7 authored by Bhumika Goyal's avatar Bhumika Goyal Committed by Takashi Iwai
Browse files

ALSA: mixart: constify snd_kcontrol_new structures 



Declare snd_kcontrol_new structures as const as they are only passed an
argument to the function snd_ctl_new1. This argument is of type const,
so snd_kcontrol_new structures having this property can be made const.
Done using Coccinelle:

@r disable optional_qualifier@
identifier x;
position p;
@@
static struct snd_kcontrol_new x@p={...};

@ok@
identifier r.x;
position p;
@@
snd_ctl_new1(&x@p,...)

@bad@
position p != {r.p,ok.p};
identifier r.x;
@@
x@p

@depends on !bad disable optional_qualifier@
identifier r.x;
@@
+const
struct snd_kcontrol_new x;

Signed-off-by: default avatarBhumika Goyal <bhumirks@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 30b5817e

sound/pci/mixart/mixart_mixer.c

+3 −3
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static int mixart_analog_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e 


static const DECLARE_TLV_DB_SCALE(db_scale_analog, -9600, 50, 0);



static struct snd_kcontrol_new mixart_control_analog_level = {

static const struct snd_kcontrol_new mixart_control_analog_level = {

	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

	.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |

		   SNDRV_CTL_ELEM_ACCESS_TLV_READ),
@@ -897,7 +897,7 @@ static int mixart_pcm_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem 


static const DECLARE_TLV_DB_SCALE(db_scale_digital, -10950, 50, 0);



static struct snd_kcontrol_new snd_mixart_pcm_vol =

static const struct snd_kcontrol_new snd_mixart_pcm_vol =

{

	.iface =        SNDRV_CTL_ELEM_IFACE_MIXER,

	.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
@@ -951,7 +951,7 @@ static int mixart_pcm_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_ 
	return changed;

}



static struct snd_kcontrol_new mixart_control_pcm_switch = {

static const struct snd_kcontrol_new mixart_control_pcm_switch = {

	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,

	/* name will be filled later */

	.count =        MIXART_PLAYBACK_STREAMS,