]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ASoC: Intel: bytcht_es8316: Convert to use acpi_dev_get_first_match_dev()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 28 Mar 2019 17:17:24 +0000 (19:17 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 1 Apr 2019 09:00:16 +0000 (11:00 +0200)
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>
sound/soc/intel/boards/bytcht_es8316.c

index d2a7e6ba11aec127858b47f82f3645eb134cfa38..6937c00cf63d191fcb9682b2248058c25c014a14 100644 (file)
@@ -442,7 +442,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct snd_soc_acpi_mach *mach;
        const char *platform_name;
-       const char *i2c_name = NULL;
+       struct acpi_device *adev;
        struct device *codec_dev;
        int dai_index = 0;
        int i;
@@ -463,10 +463,11 @@ static int snd_byt_cht_es8316_mc_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);
                byt_cht_es8316_dais[dai_index].codec_name = codec_name;
        }