forked from Minki/linux
ASoC: Intel: Use acpi_dev_present()
Use shiny new acpi_dev_present() and remove all the boilerplate
to search for a particular ACPI device. No functional change.
Cf. 2d12b6b381
("ACPI / utils: Add acpi_dev_present()").
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
92e963f50f
commit
6f08cbdaac
@ -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 */
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user