hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2019-01-29 09:42:20 -06:00 committed by Mark Brown
parent b291f42a37
commit 53b6d0adff
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/intel/boards/cht_bsw_rt5672.c
View File

@ -411,7 +411,6 @@ 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),
@ -419,13 +418,11 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
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 = cht_dailink[i].codec_name = drv->codec_name;
drv->codec_name;
break; break;
} }
} }
} }
}
/* override plaform name, if required */ /* override plaform name, if required */
platform_name = mach->mach_params.platform; platform_name = mach->mach_params.platform;