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

ALSA: ppc: 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-39-tiwai@suse.de


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

sound/ppc/awacs.c

+25 −25
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static int snd_pmac_awacs_put_master_amp(struct snd_kcontrol *kcontrol, 
#define AMP_CH_SPK	0

#define AMP_CH_HD	1



static struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] = {

static const struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] = {

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	  .name = "Speaker Playback Volume",

	  .info = snd_pmac_awacs_info_volume_amp,
@@ -582,46 +582,46 @@ static int snd_pmac_screamer_mic_boost_put(struct snd_kcontrol *kcontrol, 
/*

 * lists of mixer elements

 */

static struct snd_kcontrol_new snd_pmac_awacs_mixers[] = {

static const struct snd_kcontrol_new snd_pmac_awacs_mixers[] = {

	AWACS_SWITCH("Master Capture Switch", 1, SHIFT_LOOPTHRU, 0),

	AWACS_VOLUME("Master Capture Volume", 0, 4, 0),

/*	AWACS_SWITCH("Unknown Playback Switch", 6, SHIFT_PAROUT0, 0), */

};



static struct snd_kcontrol_new snd_pmac_screamer_mixers_beige[] = {

static const struct snd_kcontrol_new snd_pmac_screamer_mixers_beige[] = {

	AWACS_VOLUME("Master Playback Volume", 2, 6, 1),

	AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1),

	AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0),

	AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_LINE, 0),

};



static struct snd_kcontrol_new snd_pmac_screamer_mixers_lo[] = {

static const struct snd_kcontrol_new snd_pmac_screamer_mixers_lo[] = {

	AWACS_VOLUME("Line out Playback Volume", 2, 6, 1),

};



static struct snd_kcontrol_new snd_pmac_screamer_mixers_imac[] = {

static const struct snd_kcontrol_new snd_pmac_screamer_mixers_imac[] = {

	AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1),

	AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),

};



static struct snd_kcontrol_new snd_pmac_screamer_mixers_g4agp[] = {

static const struct snd_kcontrol_new snd_pmac_screamer_mixers_g4agp[] = {

	AWACS_VOLUME("Line out Playback Volume", 2, 6, 1),

	AWACS_VOLUME("Master Playback Volume", 5, 6, 1),

	AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),

	AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0),

};



static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac7500[] = {

static const struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac7500[] = {

	AWACS_VOLUME("Line out Playback Volume", 2, 6, 1),

	AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),

	AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0),

};



static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac5500[] = {

static const struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac5500[] = {

	AWACS_VOLUME("Headphone Playback Volume", 2, 6, 1),

};



static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] = {

static const struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] = {

	AWACS_VOLUME("Master Playback Volume", 2, 6, 1),

	AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),

};
@@ -629,34 +629,34 @@ static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] = { 
/* FIXME: is this correct order?

 * screamer (powerbook G3 pismo) seems to have different bits...

 */

static struct snd_kcontrol_new snd_pmac_awacs_mixers2[] = {

static const struct snd_kcontrol_new snd_pmac_awacs_mixers2[] = {

	AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_LINE, 0),

	AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_MIC, 0),

};



static struct snd_kcontrol_new snd_pmac_screamer_mixers2[] = {

static const struct snd_kcontrol_new snd_pmac_screamer_mixers2[] = {

	AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0),

	AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_LINE, 0),

};



static struct snd_kcontrol_new snd_pmac_awacs_mixers2_pmac5500[] = {

static const struct snd_kcontrol_new snd_pmac_awacs_mixers2_pmac5500[] = {

	AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0),

};



static struct snd_kcontrol_new snd_pmac_awacs_master_sw =

static const struct snd_kcontrol_new snd_pmac_awacs_master_sw =

AWACS_SWITCH("Master Playback Switch", 1, SHIFT_HDMUTE, 1);



static struct snd_kcontrol_new snd_pmac_awacs_master_sw_imac =

static const struct snd_kcontrol_new snd_pmac_awacs_master_sw_imac =

AWACS_SWITCH("Line out Playback Switch", 1, SHIFT_HDMUTE, 1);



static struct snd_kcontrol_new snd_pmac_awacs_master_sw_pmac5500 =

static const struct snd_kcontrol_new snd_pmac_awacs_master_sw_pmac5500 =

AWACS_SWITCH("Headphone Playback Switch", 1, SHIFT_HDMUTE, 1);



static struct snd_kcontrol_new snd_pmac_awacs_mic_boost[] = {

static const struct snd_kcontrol_new snd_pmac_awacs_mic_boost[] = {

	AWACS_SWITCH("Mic Boost Capture Switch", 0, SHIFT_GAINLINE, 0),

};



static struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] = {

static const struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] = {

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	  .name = "Mic Boost Capture Volume",

	  .info = snd_pmac_screamer_mic_boost_info,
@@ -665,34 +665,34 @@ static struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] = { 
	},

};



static struct snd_kcontrol_new snd_pmac_awacs_mic_boost_pmac7500[] =

static const struct snd_kcontrol_new snd_pmac_awacs_mic_boost_pmac7500[] =

{

	AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0),

};



static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_beige[] =

static const struct snd_kcontrol_new snd_pmac_screamer_mic_boost_beige[] =

{

	AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0),

	AWACS_SWITCH("CD Boost Capture Switch", 6, SHIFT_MIC_BOOST, 0),

};



static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_imac[] =

static const struct snd_kcontrol_new snd_pmac_screamer_mic_boost_imac[] =

{

	AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0),

	AWACS_SWITCH("Mic Boost Capture Switch", 6, SHIFT_MIC_BOOST, 0),

};



static struct snd_kcontrol_new snd_pmac_awacs_speaker_vol[] = {

static const struct snd_kcontrol_new snd_pmac_awacs_speaker_vol[] = {

	AWACS_VOLUME("Speaker Playback Volume", 4, 6, 1),

};



static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw =

static const struct snd_kcontrol_new snd_pmac_awacs_speaker_sw =

AWACS_SWITCH("Speaker Playback Switch", 1, SHIFT_SPKMUTE, 1);



static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac1 =

static const struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac1 =

AWACS_SWITCH("Speaker Playback Switch", 1, SHIFT_PAROUT1, 1);



static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac2 =

static const struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac2 =

AWACS_SWITCH("Speaker Playback Switch", 1, SHIFT_PAROUT1, 0);
@@ -700,7 +700,7 @@ AWACS_SWITCH("Speaker Playback Switch", 1, SHIFT_PAROUT1, 0); 
 * add new mixer elements to the card

 */

static int build_mixers(struct snd_pmac *chip, int nums,

			struct snd_kcontrol_new *mixers)

			const struct snd_kcontrol_new *mixers)

{

	int i, err;

sound/ppc/burgundy.c

+10 −10
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ static int snd_pmac_burgundy_put_switch_b(struct snd_kcontrol *kcontrol, 
/*

 * Burgundy mixers

 */

static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] = {

static const struct snd_kcontrol_new snd_pmac_burgundy_mixers[] = {

	BURGUNDY_VOLUME_W("Master Playback Volume", 0,

			MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8),

	BURGUNDY_VOLUME_W("CD Capture Volume", 0,
@@ -482,7 +482,7 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] = { 
 */	BURGUNDY_SWITCH_B("PCM Capture Switch", 0,

			MASK_ADDR_BURGUNDY_HOSTIFEH, 0x01, 0, 0)

};

static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] = {

static const struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] = {

	BURGUNDY_VOLUME_W("Line in Capture Volume", 0,

			MASK_ADDR_BURGUNDY_VOLLINE, 16),

	BURGUNDY_VOLUME_W("Mic Capture Volume", 0,
@@ -508,7 +508,7 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] = { 
	BURGUNDY_SWITCH_B("Mic Boost Capture Switch", 0,

			MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1)

};

static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] = {

static const struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] = {

	BURGUNDY_VOLUME_W("Line in Capture Volume", 0,

			MASK_ADDR_BURGUNDY_VOLMIC, 16),

	BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0,
@@ -524,33 +524,33 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] = { 
/*	BURGUNDY_SWITCH_B("Line in Boost Capture Switch", 0,

 *		MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1) */

};

static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_imac =

static const struct snd_kcontrol_new snd_pmac_burgundy_master_sw_imac =

BURGUNDY_SWITCH_B("Master Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_OUTPUT_LEFT | BURGUNDY_LINEOUT_LEFT | BURGUNDY_HP_LEFT,

	BURGUNDY_OUTPUT_RIGHT | BURGUNDY_LINEOUT_RIGHT | BURGUNDY_HP_RIGHT, 1);

static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_pmac =

static const struct snd_kcontrol_new snd_pmac_burgundy_master_sw_pmac =

BURGUNDY_SWITCH_B("Master Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_OUTPUT_INTERN

	| BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);

static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac =

static const struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac =

BURGUNDY_SWITCH_B("Speaker Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);

static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac =

static const struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac =

BURGUNDY_SWITCH_B("Speaker Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_OUTPUT_INTERN, 0, 0);

static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac =

static const struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac =

BURGUNDY_SWITCH_B("Line out Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_LINEOUT_LEFT, BURGUNDY_LINEOUT_RIGHT, 1);

static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_pmac =

static const struct snd_kcontrol_new snd_pmac_burgundy_line_sw_pmac =

BURGUNDY_SWITCH_B("Line out Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);

static struct snd_kcontrol_new snd_pmac_burgundy_hp_sw_imac =

static const struct snd_kcontrol_new snd_pmac_burgundy_hp_sw_imac =

BURGUNDY_SWITCH_B("Headphone Playback Switch", 0,

	MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES,

	BURGUNDY_HP_LEFT, BURGUNDY_HP_RIGHT, 1);

sound/ppc/daca.c

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

}



static struct snd_kcontrol_new daca_mixers[] = {

static const struct snd_kcontrol_new daca_mixers[] = {

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	  .name = "Deemphasis Switch",

	  .info = daca_info_deemphasis,

sound/ppc/pmac.c

+1 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ static int pmac_hp_detect_get(struct snd_kcontrol *kcontrol, 
	return 0;

}



static struct snd_kcontrol_new auto_mute_controls[] = {

static const struct snd_kcontrol_new auto_mute_controls[] = {

	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	  .name = "Auto Mute Switch",

	  .info = snd_pmac_boolean_mono_info,

sound/ppc/snd_ps3.c

+1 −1
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ static int snd_ps3_spdif_default_put(struct snd_kcontrol *kcontrol, 
	return 0;

}



static struct snd_kcontrol_new spdif_ctls[] = {

static const struct snd_kcontrol_new spdif_ctls[] = {

	{

		.access = SNDRV_CTL_ELEM_ACCESS_READ,

		.iface = SNDRV_CTL_ELEM_IFACE_PCM,

CRA Git | Maintained and supported by SUSTech CRA and CCSE