ASoC: Intel: Skylake: Use acpi header for NHLT header

Instead of defining own acpi header, use the available acpi
header defined in acpi framework.

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c
index a14009b47b29130ae69cb9756a131cc89807685f..13036b19d7e55f81aa77d511be5fc5f8ca87ebdf 100644 (file)
--- a/sound/soc/intel/skylake/skl-nhlt.c
+++ b/sound/soc/intel/skylake/skl-nhlt.c
@@ -17,7 +17,6 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
  */
-#include <linux/acpi.h>
 #include "skl.h"
 
 /* Unique identification for getting NHLT blobs */

diff --git a/sound/soc/intel/skylake/skl-nhlt.h b/sound/soc/intel/skylake/skl-nhlt.h
index b0e2e4da42a1e8780898e49738b6e3fa28733561..3769f9fefe2bb9f0af6d41c088c3f1755eb2df73 100644 (file)
--- a/sound/soc/intel/skylake/skl-nhlt.h
+++ b/sound/soc/intel/skylake/skl-nhlt.h
@@ -20,17 +20,7 @@
 #ifndef __SKL_NHLT_H__
 #define __SKL_NHLT_H__
 
-struct acpi_desc_header {
-       u32  signature;
-       u32  length;
-       u8   revision;
-       u8   checksum;
-       u8   oem_id[6];
-       u64  oem_table_id;
-       u32  oem_revision;
-       u32  creator_id;
-       u32  creator_revision;
-} __packed;
+#include <linux/acpi.h>
 
 struct wav_fmt {
        u16 fmt_tag;
@@ -98,7 +88,7 @@ struct nhlt_endpoint {
 } __packed;
 
 struct nhlt_acpi_table {
-       struct acpi_desc_header header;
+       struct acpi_table_header header;
        u8 endpoint_count;
        struct nhlt_endpoint desc[0];
 } __packed;