Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 3a147959 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

ASoC: Intel - Convert to use acpi_dev_get_first_match_name() 



Instead of home grown snd_soc_acpi_find_name_from_hid() use
acpi_dev_get_first_match_name().

Tested-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 05a76e81

include/sound/soc-acpi.h

+0 −7
Original line number Diff line number Diff line
@@ -31,16 +31,9 @@ struct snd_soc_acpi_package_context { 
#define SND_ACPI_I2C_ID_LEN (4 + ACPI_ID_LEN + 3 + 1)



#if IS_ENABLED(CONFIG_ACPI)

/* translation fron HID to I2C name, needed for DAI codec_name */

const char *snd_soc_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN]);

bool snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],

				    struct snd_soc_acpi_package_context *ctx);

#else

static inline const char *

snd_soc_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN])

{

	return NULL;

}

static inline bool

snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],

				   struct snd_soc_acpi_package_context *ctx)

sound/soc/intel/boards/bytcht_da7213.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static int bytcht_da7213_probe(struct platform_device *pdev) 
	}



	/* fixup codec name based on HID */

	i2c_name = snd_soc_acpi_find_name_from_hid(mach->id);

	i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1);

	if (i2c_name) {

		snprintf(codec_name, sizeof(codec_name),

			"%s%s", "i2c-", i2c_name);

sound/soc/intel/boards/bytcht_es8316.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) 
	}



	/* fixup codec name based on HID */

	i2c_name = snd_soc_acpi_find_name_from_hid(mach->id);

	i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1);

	if (i2c_name) {

		snprintf(codec_name, sizeof(codec_name),

			"%s%s", "i2c-", i2c_name);

sound/soc/intel/boards/bytcr_rt5640.c

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	}



	/* fixup codec name based on HID */

	i2c_name = snd_soc_acpi_find_name_from_hid(mach->id);

	i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1);

	if (i2c_name) {

		snprintf(byt_rt5640_codec_name, sizeof(byt_rt5640_codec_name),

			"%s%s", "i2c-", i2c_name);

sound/soc/intel/boards/bytcr_rt5651.c

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
	}



	/* fixup codec name based on HID */

	i2c_name = snd_soc_acpi_find_name_from_hid(mach->id);

	i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1);

	if (i2c_name) {

		snprintf(byt_rt5651_codec_name, sizeof(byt_rt5651_codec_name),

			"%s%s", "i2c-", i2c_name);