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>

diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
index f1c1f9dd5353db363976d2956a6d7c4ee01bebd1..3d5a2b3a06f0816201a8fca6e9040f6a34dd3e72 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_rt5672.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
@@ -411,18 +411,15 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
        strcpy(drv->codec_name, RT5672_I2C_DEFAULT);
 
        /* fixup codec name based on HID */
-       if (mach) {
-               i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1);
-               if (i2c_name) {
-                       snprintf(drv->codec_name, sizeof(drv->codec_name),
-                                "i2c-%s", i2c_name);
-                       for (i = 0; i < ARRAY_SIZE(cht_dailink); i++) {
-                               if (!strcmp(cht_dailink[i].codec_name,
-                                           RT5672_I2C_DEFAULT)) {
-                                       cht_dailink[i].codec_name =
-                                               drv->codec_name;
-                                       break;
-                               }
+       i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1);
+       if (i2c_name) {
+               snprintf(drv->codec_name, sizeof(drv->codec_name),
+                        "i2c-%s", i2c_name);
+               for (i = 0; i < ARRAY_SIZE(cht_dailink); i++) {
+                       if (!strcmp(cht_dailink[i].codec_name,
+                               RT5672_I2C_DEFAULT)) {
+                               cht_dailink[i].codec_name = drv->codec_name;
+                               break;
                        }
                }
        }