diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2018-05-15 15:12:59 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-05-15 18:05:29 +0200 |
| commit | 0cc1aa716226abf9c52e920fc04999fcafa17c67 (patch) | |
| tree | cfca8238f74a5395c63056726f4ec2d6297af97b /sound/pci | |
| parent | ALSA: hda/ca0132: constify read-only members of string array (diff) | |
| download | linux-0cc1aa716226abf9c52e920fc04999fcafa17c67.tar.xz linux-0cc1aa716226abf9c52e920fc04999fcafa17c67.zip | |
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: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_ca0132.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 8295bd06af66..08a08dd16eab 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -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, const char *pfx, int dir) { - char *fx = "FX:"; char namestr[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; int type = dir ? HDA_INPUT : HDA_OUTPUT; struct snd_kcontrol_new knew = 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.p = 0; @@ -5544,7 +5543,6 @@ static int add_fx_switch(struct hda_codec *codec, hda_nid_t nid, const char *pfx, int dir) { struct ca0132_spec *spec = codec->spec; - char *fx = "FX:"; char namestr[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; int type = dir ? HDA_INPUT : HDA_OUTPUT; 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. */ 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 sprintf(namestr, "%s %s Switch", pfx, dirstr[dir]); |