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

Commit 0cc1aa71 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: hda/ca0132: merge strings just for printk 



This module has some function-local strings just for printk therefore
it can be merged into format string.

This commit applies this optimization.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 3a03f83b

sound/pci/hda/patch_ca0132.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -5506,13 +5506,12 @@ static int ca0132_volume_tlv(struct snd_kcontrol *kcontrol, int op_flag, 
static int ca0132_alt_add_effect_slider(struct hda_codec *codec, hda_nid_t nid,

static int ca0132_alt_add_effect_slider(struct hda_codec *codec, hda_nid_t nid,

					const char *pfx, int dir)

					const char *pfx, int dir)

{

{

	char *fx = "FX:";

	char namestr[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];

	char namestr[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];

	int type = dir ? HDA_INPUT : HDA_OUTPUT;

	int type = dir ? HDA_INPUT : HDA_OUTPUT;

	struct snd_kcontrol_new knew =

	struct snd_kcontrol_new knew =

		HDA_CODEC_VOLUME_MONO(namestr, nid, 1, 0, type);

		HDA_CODEC_VOLUME_MONO(namestr, nid, 1, 0, type);





	sprintf(namestr, "%s %s %s Volume", fx, pfx, dirstr[dir]);

	sprintf(namestr, "FX: %s %s Volume", pfx, dirstr[dir]);





	knew.tlv.c = 0;

	knew.tlv.c = 0;

	knew.tlv.p = 0;

	knew.tlv.p = 0;
@@ -5544,7 +5543,6 @@ static int add_fx_switch(struct hda_codec *codec, hda_nid_t nid, 
			 const char *pfx, int dir)

			 const char *pfx, int dir)

{

{

	struct ca0132_spec *spec = codec->spec;

	struct ca0132_spec *spec = codec->spec;

	char *fx = "FX:";

	char namestr[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];

	char namestr[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];

	int type = dir ? HDA_INPUT : HDA_OUTPUT;

	int type = dir ? HDA_INPUT : HDA_OUTPUT;

	struct snd_kcontrol_new knew =

	struct snd_kcontrol_new knew =
@@ -5553,7 +5551,7 @@ static int add_fx_switch(struct hda_codec *codec, hda_nid_t nid, 
	 * prefix to OutFX or InFX enable controls.

	 * prefix to OutFX or InFX enable controls.

	 */

	 */

	if ((spec->use_alt_controls) && (nid <= IN_EFFECT_END_NID))

	if ((spec->use_alt_controls) && (nid <= IN_EFFECT_END_NID))

		sprintf(namestr, "%s %s %s Switch", fx, pfx, dirstr[dir]);

		sprintf(namestr, "FX: %s %s Switch", pfx, dirstr[dir]);

	else

	else

		sprintf(namestr, "%s %s Switch", pfx, dirstr[dir]);

		sprintf(namestr, "%s %s Switch", pfx, dirstr[dir]);