| Message ID | 04b22878b2fa0a00bad68e1570502fe64f94fb25.1452787340.git.lukas@wunner.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6f08cbdaac5a3050ea1898aef8ce326030fd1117 |
| Headers | show |
On Thu, Jan 14, 2016 at 09:57:20PM +0100, Lukas Wunner wrote: > Use shiny new acpi_dev_present() and remove all the boilerplate > to search for a particular ACPI device. No functional change. > Cf. 2d12b6b381ba ("ACPI / utils: Add acpi_dev_present()"). > > v2: Rebase on commit 95f098014815 ("ASoC: Intel: Move apci find > machine routines"). > > Cc: Mark Brown <broonie@kernel.org> > Cc: Vinod Koul <vinod.koul@intel.com> > Cc: Fang, Yang A <yang.a.fang@intel.com> > Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Signed-off-by: Lukas Wunner <lukas@wunner.de> Looks good to me but would like to test it, so once-rc1 is out, will test that and come back
On Thu, Jan 14, 2016 at 09:57:20PM +0100, Lukas Wunner wrote: > Use shiny new acpi_dev_present() and remove all the boilerplate > to search for a particular ACPI device. No functional change. > Cf. 2d12b6b381ba ("ACPI / utils: Add acpi_dev_present()"). > > v2: Rebase on commit 95f098014815 ("ASoC: Intel: Move apci find > machine routines"). As covered in SubmittingPatches don't include inter-version changelogs in the body of your commit log, put them after the ---. They are meaningless once the change is applied without the rest of the history.
Hi Mark, On Mon, Jan 25, 2016 at 03:48:46PM +0000, Mark Brown wrote: > On Thu, Jan 14, 2016 at 09:57:20PM +0100, Lukas Wunner wrote: > > Use shiny new acpi_dev_present() and remove all the boilerplate > > to search for a particular ACPI device. No functional change. > > Cf. 2d12b6b381ba ("ACPI / utils: Add acpi_dev_present()"). > > > > v2: Rebase on commit 95f098014815 ("ASoC: Intel: Move apci find > > machine routines"). > > As covered in SubmittingPatches don't include inter-version changelogs > in the body of your commit log, put them after the ---. They are > meaningless once the change is applied without the rest of the history. I'm used to the drm and drm-intel practice of including the changelog in the commit message, but will remember to move it to the git notes when posting to alsa-devel in the future. Thanks, Lukas
On Mon, Jan 25, 2016 at 10:13:58PM +0100, Lukas Wunner wrote: > On Mon, Jan 25, 2016 at 03:48:46PM +0000, Mark Brown wrote: > > As covered in SubmittingPatches don't include inter-version changelogs > > in the body of your commit log, put them after the ---. They are > > meaningless once the change is applied without the rest of the history. > I'm used to the drm and drm-intel practice of including the changelog > in the commit message, but will remember to move it to the git notes > when posting to alsa-devel in the future. drm is pretty much the only subsystem that does that.
diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c index 90588d6..e609f08 100644 --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c @@ -287,33 +287,20 @@ static struct snd_soc_card snd_soc_card_cht = { .num_controls = ARRAY_SIZE(cht_mc_controls), }; -static acpi_status snd_acpi_codec_match(acpi_handle handle, u32 level, - void *context, void **ret) -{ - *(bool *)context = true; - return AE_OK; -} - static int snd_cht_mc_probe(struct platform_device *pdev) { int ret_val = 0; - bool found = false; struct cht_mc_private *drv; drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_ATOMIC); if (!drv) return -ENOMEM; - if (ACPI_SUCCESS(acpi_get_devices( - "104C227E", - snd_acpi_codec_match, - &found, NULL)) && found) { - drv->ts3a227e_present = true; - } else { + drv->ts3a227e_present = acpi_dev_present("104C227E"); + if (!drv->ts3a227e_present) { /* no need probe TI jack detection chip */ snd_soc_card_cht.aux_dev = NULL; snd_soc_card_cht.num_aux_devs = 0; - drv->ts3a227e_present = false; } /* register the soc card */ diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index 2d3afdd..e6cf800 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -333,20 +333,12 @@ static struct cht_acpi_card snd_soc_cards[] = { {"10EC5650", CODEC_TYPE_RT5650, &snd_soc_card_chtrt5650}, }; -static acpi_status snd_acpi_codec_match(acpi_handle handle, u32 level, - void *context, void **ret) -{ - *(bool *)context = true; - return AE_OK; -} - static int snd_cht_mc_probe(struct platform_device *pdev) { int ret_val = 0; int i; struct cht_mc_private *drv; struct snd_soc_card *card = snd_soc_cards[0].soc_card; - bool found = false; char codec_name[16]; drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_ATOMIC); @@ -354,10 +346,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) return -ENOMEM; for (i = 0; i < ARRAY_SIZE(snd_soc_cards); i++) { - if (ACPI_SUCCESS(acpi_get_devices( - snd_soc_cards[i].codec_id, - snd_acpi_codec_match, - &found, NULL)) && found) { + if (acpi_dev_present(snd_soc_cards[i].codec_id)) { dev_dbg(&pdev->dev, "found codec %s\n", snd_soc_cards[i].codec_id); card = snd_soc_cards[i].soc_card; diff --git a/sound/soc/intel/common/sst-match-acpi.c b/sound/soc/intel/common/sst-match-acpi.c index dd077e1..c429e22 100644 --- a/sound/soc/intel/common/sst-match-acpi.c +++ b/sound/soc/intel/common/sst-match-acpi.c @@ -13,29 +13,15 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. */ -#include <linux/acpi.h> -#include <linux/device.h> -#include <linux/module.h> -#include <linux/platform_device.h> #include "sst-acpi.h" -static acpi_status sst_acpi_mach_match(acpi_handle handle, u32 level, - void *context, void **ret) -{ - *(bool *)context = true; - return AE_OK; -} - struct sst_acpi_mach *sst_acpi_find_machine(struct sst_acpi_mach *machines) { struct sst_acpi_mach *mach; - bool found = false; for (mach = machines; mach->id[0]; mach++) - if (ACPI_SUCCESS(acpi_get_devices(mach->id, - sst_acpi_mach_match, - &found, NULL)) && found) + if (acpi_dev_present(mach->id)) return mach; return NULL;
Use shiny new acpi_dev_present() and remove all the boilerplate to search for a particular ACPI device. No functional change. Cf. 2d12b6b381ba ("ACPI / utils: Add acpi_dev_present()"). v2: Rebase on commit 95f098014815 ("ASoC: Intel: Move apci find machine routines"). Cc: Mark Brown <broonie@kernel.org> Cc: Vinod Koul <vinod.koul@intel.com> Cc: Fang, Yang A <yang.a.fang@intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Lukas Wunner <lukas@wunner.de> --- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 17 ++--------------- sound/soc/intel/boards/cht_bsw_rt5645.c | 13 +------------ sound/soc/intel/common/sst-match-acpi.c | 16 +--------------- 3 files changed, 4 insertions(+), 42 deletions(-)