ASoC: Intel: boards: get codec device with ACPI instead of bus search
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Fri, 13 Aug 2021 15:11:11 +0000 (10:11 -0500)
committerMark Brown <broonie@kernel.org>
Fri, 13 Aug 2021 15:50:39 +0000 (16:50 +0100)
We have an existing 'adev' handle from which we can find the codec
device, no need for an I2C bus search.

Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210813151116.23931-4-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/bytcht_es8316.c
sound/soc/intel/boards/bytcr_rt5640.c
sound/soc/intel/boards/bytcr_rt5651.c

index 3224ab7faaa3bab9730f8d0071ffd4973c1455e7..d2e0a0b441fc94419213e30dc66690bf2a08caf6 100644 (file)
@@ -539,9 +539,10 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
        }
 
        /* get speaker enable GPIO */
-       codec_dev = bus_find_device_by_name(&i2c_bus_type, NULL, codec_name);
+       codec_dev = acpi_get_first_physical_node(adev);
        if (!codec_dev)
                return -EPROBE_DEFER;
+       priv->codec_dev = get_device(codec_dev);
 
        if (quirk & BYT_CHT_ES8316_JD_INVERTED)
                props[cnt++] = PROPERTY_ENTRY_BOOL("everest,jack-detect-inverted");
@@ -559,7 +560,6 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
                gpiod_get_index(codec_dev, "speaker-enable", 0,
                                /* see comment in byt_cht_es8316_resume */
                                GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE);
-       priv->codec_dev = codec_dev;
 
        if (IS_ERR(priv->speaker_en_gpio)) {
                ret = PTR_ERR(priv->speaker_en_gpio);
index 65c37b037a97c24a78ab534f70abbd3ce7608237..4215bbafd2f7eeba7c5981ebca398c267a53436d 100644 (file)
@@ -1473,11 +1473,10 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
                byt_rt5640_quirk = quirk_override;
        }
 
-       codec_dev = bus_find_device_by_name(&i2c_bus_type, NULL, byt_rt5640_codec_name);
+       codec_dev = acpi_get_first_physical_node(adev);
        if (!codec_dev)
                return -EPROBE_DEFER;
-
-       priv->codec_dev = codec_dev;
+       priv->codec_dev = get_device(codec_dev);
 
        /* Must be called before register_card, also see declaration comment. */
        ret_val = byt_rt5640_add_codec_device_props(codec_dev, priv);
index b4307d1d5527d267822e9aa614dd44a13bce590b..c70dd729cdbb7582500c4e1d67842de4d636d85c 100644 (file)
@@ -924,10 +924,10 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
-       codec_dev = bus_find_device_by_name(&i2c_bus_type, NULL,
-                                           byt_rt5651_codec_name);
+       codec_dev = acpi_get_first_physical_node(adev);
        if (!codec_dev)
                return -EPROBE_DEFER;
+       priv->codec_dev = get_device(codec_dev);
 
        /*
         * swap SSP0 if bytcr is detected
@@ -994,8 +994,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
                byt_rt5651_quirk = quirk_override;
        }
 
-       priv->codec_dev = codec_dev;
-
        /* Must be called before register_card, also see declaration comment. */
        ret_val = byt_rt5651_add_codec_device_props(codec_dev);
        if (ret_val)