Commit 53b6d0ad authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown

ASoC: Intel: cht_bsw_rt5672: remove useless test

For some reason we test if the machine is passed as a parameter before
fixing up the codec name. This is unnecessary, generates false
positives in static analysis tools and done only in this machine
driver, remove and adjust indentation.
Reported-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b291f42a
...@@ -411,18 +411,15 @@ static int snd_cht_mc_probe(struct platform_device *pdev) ...@@ -411,18 +411,15 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
strcpy(drv->codec_name, RT5672_I2C_DEFAULT); strcpy(drv->codec_name, RT5672_I2C_DEFAULT);
/* fixup codec name based on HID */ /* fixup codec name based on HID */
if (mach) { i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1);
i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1); if (i2c_name) {
if (i2c_name) { snprintf(drv->codec_name, sizeof(drv->codec_name),
snprintf(drv->codec_name, sizeof(drv->codec_name), "i2c-%s", i2c_name);
"i2c-%s", i2c_name); for (i = 0; i < ARRAY_SIZE(cht_dailink); i++) {
for (i = 0; i < ARRAY_SIZE(cht_dailink); i++) { if (!strcmp(cht_dailink[i].codec_name,
if (!strcmp(cht_dailink[i].codec_name, RT5672_I2C_DEFAULT)) {
RT5672_I2C_DEFAULT)) { cht_dailink[i].codec_name = drv->codec_name;
cht_dailink[i].codec_name = break;
drv->codec_name;
break;
}
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment