Unverified Commit d3409eb2 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

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



We have an existing 'adev' handle from which we can find the codec
device, no need for an I2C bus search.

Suggested-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarPierre-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: default avatarMark Brown <broonie@kernel.org>
parent 69efe3b8

sound/soc/intel/boards/bytcht_es8316.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

sound/soc/intel/boards/bytcr_rt5640.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

sound/soc/intel/boards/bytcr_rt5651.c

+2 −4
Original line number Diff line number Diff line
@@ -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)