Unverified Commit cdb76568 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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



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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87wnp9yl6y.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 14db5499

sound/soc/soc-core.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -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);

	}

	}