diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2017-03-24 18:40:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-03-29 13:53:32 +0200 |
| commit | 6ad0005f179fded911e69f54f96c03e5f8cbf67a (patch) | |
| tree | a4f3c68fa18197b7ffb02efc843ff323213a0a96 /sound/soc/intel/skylake/skl-nhlt.c | |
| parent | ASoC: Intel: Skylake: Remove redundant vmixer handler (diff) | |
| download | linux-6ad0005f179fded911e69f54f96c03e5f8cbf67a.tar.xz linux-6ad0005f179fded911e69f54f96c03e5f8cbf67a.zip | |
ASoC: Intel: Skylake: remove hard coded ACPI path
We should not hard code the ACPI path to get acpi_handle. Instead use
ACPI_HANDLE macro to do the job.
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/skylake/skl-nhlt.c')
| -rw-r--r-- | sound/soc/intel/skylake/skl-nhlt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c index 7eb9c419dc7f..e3f06672fd6d 100644 --- a/sound/soc/intel/skylake/skl-nhlt.c +++ b/sound/soc/intel/skylake/skl-nhlt.c @@ -24,8 +24,6 @@ static u8 OSC_UUID[16] = {0x6E, 0x88, 0x9F, 0xA6, 0xEB, 0x6C, 0x94, 0x45, 0xA4, 0x1F, 0x7B, 0x5D, 0xCE, 0x24, 0xC5, 0x53}; -#define DSDT_NHLT_PATH "\\_SB.PCI0.HDAS" - struct nhlt_acpi_table *skl_nhlt_init(struct device *dev) { acpi_handle handle; @@ -33,8 +31,9 @@ struct nhlt_acpi_table *skl_nhlt_init(struct device *dev) struct nhlt_resource_desc *nhlt_ptr = NULL; struct nhlt_acpi_table *nhlt_table = NULL; - if (ACPI_FAILURE(acpi_get_handle(NULL, DSDT_NHLT_PATH, &handle))) { - dev_err(dev, "Requested NHLT device not found\n"); + handle = ACPI_HANDLE(dev); + if (!handle) { + dev_err(dev, "Didn't find ACPI_HANDLE\n"); return NULL; } |