alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
	linux-acpi@vger.kernel.org,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
	Liam Girdwood <liam.r.girdwood@linux.intel.com>,
	Jie Yang <yang.jie@linux.intel.com>,
	Mark Brown <broonie@kernel.org>,
	alsa-devel@alsa-project.org, Hans de Goede <hdegoede@redhat.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v3 04/10] ASoC: Intel: bytcht_da7213: Convert to use acpi_dev_get_first_match_dev()
Date: Thu, 28 Mar 2019 19:17:23 +0200	[thread overview]
Message-ID: <20190328171729.44002-5-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20190328171729.44002-1-andriy.shevchenko@linux.intel.com>

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>
---
 sound/soc/intel/boards/bytcht_da7213.c | 9 +++++----
 1 file 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;
 	}
 
-- 
2.20.1

  parent reply	other threads:[~2019-03-28 17:17 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-28 17:17 [PATCH v3 00/10] ACPI / utils: Replace leaky function Andy Shevchenko
2019-03-28 17:17 ` [PATCH v3 01/10] ACPI / utils: Introduce acpi_dev_get_first_match_dev() helper Andy Shevchenko
2019-03-28 20:12   ` Rafael J. Wysocki
2019-03-28 21:38     ` Andy Shevchenko
2019-04-01  7:23   ` Mark Brown
2019-03-28 17:17 ` [PATCH v3 02/10] extcon: axp288: Convert to use acpi_dev_get_first_match_dev() Andy Shevchenko
2019-03-29  0:53   ` Chanwoo Choi
2019-03-29 22:58     ` Rafael J. Wysocki
2019-04-01  1:25       ` Chanwoo Choi
2019-03-28 17:17 ` [PATCH v3 03/10] gpio: merrifield: " Andy Shevchenko
2019-03-28 17:17 ` Andy Shevchenko [this message]
2019-03-28 17:17 ` [PATCH v3 05/10] ASoC: Intel: bytcht_es8316: " Andy Shevchenko
2019-03-28 17:17 ` [PATCH v3 06/10] ASoC: Intel: bytcr_rt5640: " Andy Shevchenko
2019-03-28 17:17 ` [PATCH v3 07/10] ASoC: Intel: bytcr_rt5651: " Andy Shevchenko
2019-03-28 17:17 ` [PATCH v3 08/10] ASoC: Intel: cht_bsw_rt5645: " Andy Shevchenko
2019-03-28 17:17 ` [PATCH v3 09/10] ASoC: Intel: cht_bsw_rt5672: " Andy Shevchenko
2019-03-28 17:17 ` [PATCH v3 10/10] ACPI / utils: Remove deprecated function since no user left Andy Shevchenko
2019-03-28 18:31 ` [PATCH v3 00/10] ACPI / utils: Replace leaky function Pierre-Louis Bossart
2019-03-28 21:40   ` Andy Shevchenko
2019-03-28 23:33     ` Rafael J. Wysocki
2019-04-01  7:24       ` Mark Brown
2019-04-02  9:02         ` Rafael J. Wysocki
2019-03-28 22:29 ` Hans de Goede
2019-03-29  9:29 ` Mika Westerberg
2019-04-02  8:57 ` Rafael J. Wysocki
2019-04-02  9:17   ` Rafael J. Wysocki
2019-04-02 10:37     ` Andy Shevchenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190328171729.44002-5-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=hdegoede@redhat.com \
    --cc=liam.r.girdwood@linux.intel.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=mika.westerberg@linux.intel.com \
    --cc=pierre-louis.bossart@linux.intel.com \
    --cc=rjw@rjwysocki.net \
    --cc=yang.jie@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).