korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 20:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: Intel - Convert to use acpi_dev_get_first_match_name()

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

Tested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andy Shevchenko 2018-01-12 23:16:17 +02:00 committed by Mark Brown
parent 05a76e8101
commit 3a1479599a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
8 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/sound/soc-acpi.h
View File

@ -31,16 +31,9 @@ struct snd_soc_acpi_package_context {
#define SND_ACPI_I2C_ID_LEN (4 + ACPI_ID_LEN + 3 + 1) #define SND_ACPI_I2C_ID_LEN (4 + ACPI_ID_LEN + 3 + 1)
#if IS_ENABLED(CONFIG_ACPI) #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], bool snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],
struct snd_soc_acpi_package_context *ctx); struct snd_soc_acpi_package_context *ctx);
#else #else
static inline const char *
snd_soc_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN])
{
return NULL;
}
static inline bool static inline bool
snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN], snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],
struct snd_soc_acpi_package_context *ctx) struct snd_soc_acpi_package_context *ctx)

2
sound/soc/intel/boards/bytcht_da7213.c
View File

@ -243,7 +243,7 @@ static int bytcht_da7213_probe(struct platform_device *pdev)
} }
/* fixup codec name based on HID */ /* 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) { if (i2c_name) {
snprintf(codec_name, sizeof(codec_name), snprintf(codec_name, sizeof(codec_name),
"%s%s", "i2c-", i2c_name); "%s%s", "i2c-", i2c_name);

2
sound/soc/intel/boards/bytcht_es8316.c
View File

@ -258,7 +258,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
} }
/* fixup codec name based on HID */ /* 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) { if (i2c_name) {
snprintf(codec_name, sizeof(codec_name), snprintf(codec_name, sizeof(codec_name),
"%s%s", "i2c-", i2c_name); "%s%s", "i2c-", i2c_name);

2
sound/soc/intel/boards/bytcr_rt5640.c
View File

@ -762,7 +762,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
} }
/* fixup codec name based on HID */ /* 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) { if (i2c_name) {
snprintf(byt_rt5640_codec_name, sizeof(byt_rt5640_codec_name), snprintf(byt_rt5640_codec_name, sizeof(byt_rt5640_codec_name),
"%s%s", "i2c-", i2c_name); "%s%s", "i2c-", i2c_name);

2
sound/soc/intel/boards/bytcr_rt5651.c
View File

@ -539,7 +539,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
} }
/* fixup codec name based on HID */ /* 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) { if (i2c_name) {
snprintf(byt_rt5651_codec_name, sizeof(byt_rt5651_codec_name), snprintf(byt_rt5651_codec_name, sizeof(byt_rt5651_codec_name),
"%s%s", "i2c-", i2c_name); "%s%s", "i2c-", i2c_name);

2
sound/soc/intel/boards/cht_bsw_rt5645.c
View File

@ -566,7 +566,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
} }
/* fixup codec name based on HID */ /* 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) { if (i2c_name) {
snprintf(cht_rt5645_codec_name, sizeof(cht_rt5645_codec_name), snprintf(cht_rt5645_codec_name, sizeof(cht_rt5645_codec_name),
"%s%s", "i2c-", i2c_name); "%s%s", "i2c-", i2c_name);

2
sound/soc/intel/boards/cht_bsw_rt5672.c
View File

@ -396,7 +396,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
/* fixup codec name based on HID */ /* fixup codec name based on HID */
if (mach) { if (mach) {
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) { if (i2c_name) {
snprintf(drv->codec_name, sizeof(drv->codec_name), snprintf(drv->codec_name, sizeof(drv->codec_name),
"i2c-%s", i2c_name); "i2c-%s", i2c_name);

33
sound/soc/soc-acpi.c
View File

@ -16,39 +16,6 @@
#include <sound/soc-acpi.h> #include <sound/soc-acpi.h>
static acpi_status snd_soc_acpi_find_name(acpi_handle handle, u32 level,
void *context, void **ret)
{
struct acpi_device *adev;
const char *name = NULL;
if (acpi_bus_get_device(handle, &adev))
return AE_OK;
if (adev->status.present && adev->status.functional) {
name = acpi_dev_name(adev);
*(const char **)ret = name;
return AE_CTRL_TERMINATE;
}
return AE_OK;
}
const char *snd_soc_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN])
{
const char *name = NULL;
acpi_status status;
status = acpi_get_devices(hid, snd_soc_acpi_find_name, NULL,
(void **)&name);
if (ACPI_FAILURE(status) || name[0] == '\0')
return NULL;
return name;
}
EXPORT_SYMBOL_GPL(snd_soc_acpi_find_name_from_hid);
struct snd_soc_acpi_mach * struct snd_soc_acpi_mach *
snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines) snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines)
{ {