renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-01 10:13:58 +08:00
Code

ASoC: soc-core: cleanup cppcheck warning at snd_soc_set_dmi_name()

Browse Source 
This patch cleanups below cppcheck warning.

 const char *vendor, *product, *product_version, *board;
                                ^

sound/soc/soc-core.c:1721:33: style: The scope of the variable 'product_version' can be reduced. [variableScope]
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87wnp9yl6y.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2021-07-29 10:15:33 +09:00 committed by Mark Brown
parent 14db5499d5
commit cdb76568b0
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/soc-core.c
View File

@ -1718,7 +1718,7 @@ static void append_dmi_string(struct snd_soc_card *card, const char *str)
*/ */
int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
{ {
const char *vendor, *product, *product_version, *board; const char *vendor, *product, *board;
if (card->long_name) if (card->long_name)
return 0; /* long name already set by driver or from DMI */ return 0; /* long name already set by driver or from DMI */
@ -1738,13 +1738,14 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
product = dmi_get_system_info(DMI_PRODUCT_NAME); product = dmi_get_system_info(DMI_PRODUCT_NAME);
if (product && is_dmi_valid(product)) { if (product && is_dmi_valid(product)) {
const char *product_version = dmi_get_system_info(DMI_PRODUCT_VERSION);
append_dmi_string(card, product); append_dmi_string(card, product);
/* /*
* some vendors like Lenovo may only put a self-explanatory * some vendors like Lenovo may only put a self-explanatory
* name in the product version field * name in the product version field
*/ */
product_version = dmi_get_system_info(DMI_PRODUCT_VERSION);
if (product_version && is_dmi_valid(product_version)) if (product_version && is_dmi_valid(product_version))
append_dmi_string(card, product_version); append_dmi_string(card, product_version);
} }