ASoC: Intel: boards: get codec device with ACPI instead of bus search

[ Upstream commit d3409eb20d3ed7d9e021cd13243e9e63255a315f ]

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>
Stable-dep-of: 721858823d7c ("ASoC: Intel: bytcr_rt5651: Drop reference count of ACPI device after use")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c
index 91351b8536aa1d6fca7abfc2b7a04a98301de5bf..03b9cdbd3170fc507168249c058660c3bf9eec60 100644 (file)
--- a/sound/soc/intel/boards/bytcht_es8316.c
+++ b/sound/soc/intel/boards/bytcht_es8316.c
@@ -550,9 +550,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");
@@ -570,7 +571,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);

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index b531c348fb6977644dc7b38b1a902fca2950a8f7..f5b1b3b876980872e88aede461654ef8c51900a5 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -1425,11 +1425,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);

diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index acea83e814acb38ba3ac51a30d32f27146e1095b..472f6e33279604f2eb076ed2c57104f9fb574bd0 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -926,10 +926,10 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       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
@@ -996,8 +996,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)