Commit fdd1f6fd authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: isa: Constify snd_kcontrol_new items 

Most of snd_kcontrol_new definitions are read-only and passed as-is.
Let's declare them as const for further optimization.

There should be no functional changes by this patch.

Link: https://lore.kernel.org/r/20200103081714.9560-36-tiwai@suse.de


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

sound/isa/ad1816a/ad1816a_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_6bit, -9450, 150, 0); 
static const DECLARE_TLV_DB_SCALE(db_scale_5bit_12db_max, -3450, 150, 0);

static const DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 150, 0);



static struct snd_kcontrol_new snd_ad1816a_controls[] = {

static const struct snd_kcontrol_new snd_ad1816a_controls[] = {

AD1816A_DOUBLE("Master Playback Switch", AD1816A_MASTER_ATT, 15, 7, 1, 1),

AD1816A_DOUBLE_TLV("Master Playback Volume", AD1816A_MASTER_ATT, 8, 0, 31, 1,

		   db_scale_5bit),

sound/isa/cmi8330.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_cmi8330_pnpids); 
#endif





static struct snd_kcontrol_new snd_cmi8330_controls[] = {

static const struct snd_kcontrol_new snd_cmi8330_controls[] = {

WSS_DOUBLE("Master Playback Volume", 0,

		CMI8330_MASTVOL, CMI8330_MASTVOL, 4, 0, 15, 0),

WSS_SINGLE("Loud Playback Switch", 0,

sound/isa/cs423x/cs4236_lib.c

+7 −7
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_4bit, -4500, 300, 0); 
static const DECLARE_TLV_DB_SCALE(db_scale_2bit, -1800, 600, 0);

static const DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 150, 0);



static struct snd_kcontrol_new snd_cs4236_controls[] = {

static const struct snd_kcontrol_new snd_cs4236_controls[] = {



CS4236_DOUBLE("Master Digital Playback Switch", 0,

		CS4236_LEFT_MASTER, CS4236_RIGHT_MASTER, 7, 7, 1, 1),
@@ -853,7 +853,7 @@ CS4236_DOUBLE1_TLV("Loopback Digital Playback Volume", 0, 
static const DECLARE_TLV_DB_SCALE(db_scale_5bit_6db_max, -5600, 200, 0);

static const DECLARE_TLV_DB_SCALE(db_scale_2bit_16db_max, -2400, 800, 0);



static struct snd_kcontrol_new snd_cs4235_controls[] = {

static const struct snd_kcontrol_new snd_cs4235_controls[] = {



WSS_DOUBLE("Master Playback Switch", 0,

		CS4235_LEFT_MASTER, CS4235_RIGHT_MASTER, 7, 7, 1, 1),
@@ -986,7 +986,7 @@ static int snd_cs4236_put_iec958_switch(struct snd_kcontrol *kcontrol, struct sn 
	return change;

}



static struct snd_kcontrol_new snd_cs4236_iec958_controls[] = {

static const struct snd_kcontrol_new snd_cs4236_iec958_controls[] = {

CS4236_IEC958_ENABLE("IEC958 Output Enable", 0),

CS4236_SINGLEC("IEC958 Output Validity", 0, 4, 4, 1, 0),

CS4236_SINGLEC("IEC958 Output User", 0, 4, 5, 1, 0),
@@ -995,12 +995,12 @@ CS4236_SINGLEC("IEC958 Output Channel Status Low", 0, 5, 1, 127, 0), 
CS4236_SINGLEC("IEC958 Output Channel Status High", 0, 6, 0, 255, 0)

};



static struct snd_kcontrol_new snd_cs4236_3d_controls_cs4235[] = {

static const struct snd_kcontrol_new snd_cs4236_3d_controls_cs4235[] = {

CS4236_SINGLEC("3D Control - Switch", 0, 3, 4, 1, 0),

CS4236_SINGLEC("3D Control - Space", 0, 2, 4, 15, 1)

};



static struct snd_kcontrol_new snd_cs4236_3d_controls_cs4237[] = {

static const struct snd_kcontrol_new snd_cs4236_3d_controls_cs4237[] = {

CS4236_SINGLEC("3D Control - Switch", 0, 3, 7, 1, 0),

CS4236_SINGLEC("3D Control - Space", 0, 2, 4, 15, 1),

CS4236_SINGLEC("3D Control - Center", 0, 2, 0, 15, 1),
@@ -1008,7 +1008,7 @@ CS4236_SINGLEC("3D Control - Mono", 0, 3, 6, 1, 0), 
CS4236_SINGLEC("3D Control - IEC958", 0, 3, 5, 1, 0)

};



static struct snd_kcontrol_new snd_cs4236_3d_controls_cs4238[] = {

static const struct snd_kcontrol_new snd_cs4236_3d_controls_cs4238[] = {

CS4236_SINGLEC("3D Control - Switch", 0, 3, 4, 1, 0),

CS4236_SINGLEC("3D Control - Space", 0, 2, 4, 15, 1),

CS4236_SINGLEC("3D Control - Volume", 0, 2, 0, 15, 1),
@@ -1020,7 +1020,7 @@ int snd_cs4236_mixer(struct snd_wss *chip) 
	struct snd_card *card;

	unsigned int idx, count;

	int err;

	struct snd_kcontrol_new *kcontrol;

	const struct snd_kcontrol_new *kcontrol;



	if (snd_BUG_ON(!chip || !chip->card))

		return -EINVAL;

sound/isa/es1688/es1688_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ static int snd_es1688_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e 
	return change;

}



static struct snd_kcontrol_new snd_es1688_controls[] = {

static const struct snd_kcontrol_new snd_es1688_controls[] = {

ES1688_DOUBLE("Master Playback Volume", 0, ES1688_MASTER_DEV, ES1688_MASTER_DEV, 4, 0, 15, 0),

ES1688_DOUBLE("PCM Playback Volume", 0, ES1688_PCM_DEV, ES1688_PCM_DEV, 4, 0, 15, 0),

ES1688_DOUBLE("Line Playback Volume", 0, ES1688_LINE_DEV, ES1688_LINE_DEV, 4, 0, 15, 0),

sound/isa/es18xx.c

+13 −13
Original line number Diff line number Diff line
@@ -1246,7 +1246,7 @@ static int snd_es18xx_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e 
 * The controls that are universal to all chipsets are fully initialized

 * here.

 */

static struct snd_kcontrol_new snd_es18xx_base_controls[] = {

static const struct snd_kcontrol_new snd_es18xx_base_controls[] = {

ES18XX_DOUBLE("Master Playback Volume", 0, 0x60, 0x62, 0, 0, 63, 0),

ES18XX_DOUBLE("Master Playback Switch", 0, 0x60, 0x62, 6, 6, 1, 1),

ES18XX_DOUBLE("Line Playback Volume", 0, 0x3e, 0x3e, 4, 0, 15, 0),
@@ -1265,7 +1265,7 @@ ES18XX_DOUBLE("Capture Volume", 0, 0xb4, 0xb4, 4, 0, 15, 0), 
}

};



static struct snd_kcontrol_new snd_es18xx_recmix_controls[] = {

static const struct snd_kcontrol_new snd_es18xx_recmix_controls[] = {

ES18XX_DOUBLE("PCM Capture Volume", 0, 0x69, 0x69, 4, 0, 15, 0),

ES18XX_DOUBLE("Mic Capture Volume", 0, 0x68, 0x68, 4, 0, 15, 0),

ES18XX_DOUBLE("Line Capture Volume", 0, 0x6e, 0x6e, 4, 0, 15, 0),
@@ -1277,35 +1277,35 @@ ES18XX_DOUBLE("Aux Capture Volume", 0, 0x6c, 0x6c, 4, 0, 15, 0) 
/*

 * The chipset specific mixer controls

 */

static struct snd_kcontrol_new snd_es18xx_opt_speaker =

static const struct snd_kcontrol_new snd_es18xx_opt_speaker =

	ES18XX_SINGLE("Beep Playback Volume", 0, 0x3c, 0, 7, 0);



static struct snd_kcontrol_new snd_es18xx_opt_1869[] = {

static const struct snd_kcontrol_new snd_es18xx_opt_1869[] = {

ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, ES18XX_FL_INVERT),

ES18XX_SINGLE("Video Playback Switch", 0, 0x7f, 0, 1, 0),

ES18XX_DOUBLE("Mono Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0),

ES18XX_DOUBLE("Mono Capture Volume", 0, 0x6f, 0x6f, 4, 0, 15, 0)

};



static struct snd_kcontrol_new snd_es18xx_opt_1878 =

static const struct snd_kcontrol_new snd_es18xx_opt_1878 =

	ES18XX_DOUBLE("Video Playback Volume", 0, 0x68, 0x68, 4, 0, 15, 0);



static struct snd_kcontrol_new snd_es18xx_opt_1879[] = {

static const struct snd_kcontrol_new snd_es18xx_opt_1879[] = {

ES18XX_SINGLE("Video Playback Switch", 0, 0x71, 6, 1, 0),

ES18XX_DOUBLE("Video Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0),

ES18XX_DOUBLE("Video Capture Volume", 0, 0x6f, 0x6f, 4, 0, 15, 0)

};



static struct snd_kcontrol_new snd_es18xx_pcm1_controls[] = {

static const struct snd_kcontrol_new snd_es18xx_pcm1_controls[] = {

ES18XX_DOUBLE("PCM Playback Volume", 0, 0x14, 0x14, 4, 0, 15, 0),

};



static struct snd_kcontrol_new snd_es18xx_pcm2_controls[] = {

static const struct snd_kcontrol_new snd_es18xx_pcm2_controls[] = {

ES18XX_DOUBLE("PCM Playback Volume", 0, 0x7c, 0x7c, 4, 0, 15, 0),

ES18XX_DOUBLE("PCM Playback Volume", 1, 0x14, 0x14, 4, 0, 15, 0)

};



static struct snd_kcontrol_new snd_es18xx_spatializer_controls[] = {

static const struct snd_kcontrol_new snd_es18xx_spatializer_controls[] = {

ES18XX_SINGLE("3D Control - Level", 0, 0x52, 0, 63, 0),

{

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -1316,13 +1316,13 @@ ES18XX_SINGLE("3D Control - Level", 0, 0x52, 0, 63, 0), 
}

};



static struct snd_kcontrol_new snd_es18xx_micpre1_control = 

static const struct snd_kcontrol_new snd_es18xx_micpre1_control =

ES18XX_SINGLE("Mic Boost (+26dB)", 0, 0xa9, 2, 1, 0);



static struct snd_kcontrol_new snd_es18xx_micpre2_control =

static const struct snd_kcontrol_new snd_es18xx_micpre2_control =

ES18XX_SINGLE("Mic Boost (+26dB)", 0, 0x7d, 3, 1, 0);



static struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = {

static const struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = {

{

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "Hardware Master Playback Volume",
@@ -1340,7 +1340,7 @@ static struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = { 
ES18XX_SINGLE("Hardware Master Volume Split", 0, 0x64, 7, 1, 0),

};



static struct snd_kcontrol_new snd_es18xx_opt_gpo_2bit[] = {

static const struct snd_kcontrol_new snd_es18xx_opt_gpo_2bit[] = {

ES18XX_SINGLE("GPO0 Switch", 0, ES18XX_PM, 0, 1, ES18XX_FL_PMPORT),

ES18XX_SINGLE("GPO1 Switch", 0, ES18XX_PM, 1, 1, ES18XX_FL_PMPORT),

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE