diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2019-03-28 19:17:23 +0200 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-04-01 11:00:16 +0200 |
| commit | 1b55f1c6fd64efd7b1339664edc1222ad99f9c9b (patch) | |
| tree | 38948df819b405943db511198dac64e88a52d1a4 /sound/soc/intel/boards/bytcht_da7213.c | |
| parent | gpio: merrifield: Convert to use acpi_dev_get_first_match_dev() (diff) | |
| download | linux-dev-1b55f1c6fd64efd7b1339664edc1222ad99f9c9b.tar.xz linux-dev-1b55f1c6fd64efd7b1339664edc1222ad99f9c9b.zip | |
ASoC: Intel: bytcht_da7213: Convert to use acpi_dev_get_first_match_dev()
acpi_dev_get_first_match_name() is deprecated and going to be removed
because it leaks a reference.
Convert the driver to use acpi_dev_get_first_match_dev() instead.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'sound/soc/intel/boards/bytcht_da7213.c')
| -rw-r--r-- | sound/soc/intel/boards/bytcht_da7213.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/intel/boards/bytcht_da7213.c b/sound/soc/intel/boards/bytcht_da7213.c index b8e884803777..4decba338156 100644 --- a/sound/soc/intel/boards/bytcht_da7213.c +++ b/sound/soc/intel/boards/bytcht_da7213.c @@ -226,7 +226,7 @@ static int bytcht_da7213_probe(struct platform_device *pdev) struct snd_soc_card *card; struct snd_soc_acpi_mach *mach; const char *platform_name; - const char *i2c_name = NULL; + struct acpi_device *adev; int dai_index = 0; int ret_val = 0; int i; @@ -244,10 +244,11 @@ static int bytcht_da7213_probe(struct platform_device *pdev) } /* fixup codec name based on HID */ - i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1); - if (i2c_name) { + adev = acpi_dev_get_first_match_dev(mach->id, NULL, -1); + if (adev) { snprintf(codec_name, sizeof(codec_name), - "%s%s", "i2c-", i2c_name); + "i2c-%s", acpi_dev_name(adev)); + put_device(&adev->dev); dailink[dai_index].codec_name = codec_name; } |