From: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com
All ACPI table structs except for NHLT ones are defined in postfix way. Update NHLT structs naming to make code cohesive.
Signed-off-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com Signed-off-by: Cezary Rojewski cezary.rojewski@intel.com --- include/sound/intel-nhlt.h | 16 ++++++++-------- sound/hda/intel-dsp-config.c | 2 +- sound/hda/intel-nhlt.c | 8 ++++---- sound/soc/intel/skylake/skl-nhlt.c | 8 ++++---- sound/soc/intel/skylake/skl.h | 2 +- sound/soc/sof/intel/hda.c | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/include/sound/intel-nhlt.h b/include/sound/intel-nhlt.h index 4debab7c1996..b7eec4b3ca01 100644 --- a/include/sound/intel-nhlt.h +++ b/include/sound/intel-nhlt.h @@ -77,7 +77,7 @@ struct nhlt_endpoint { struct nhlt_specific_cfg config; } __packed;
-struct nhlt_acpi_table { +struct acpi_table_nhlt { struct acpi_table_header header; u8 endpoint_count; struct nhlt_endpoint desc[]; @@ -126,26 +126,26 @@ enum { NHLT_MIC_ARRAY_VENDOR_DEFINED = 0xf, };
-struct nhlt_acpi_table *intel_nhlt_init(void); +struct acpi_table_nhlt *intel_nhlt_init(void);
-void intel_nhlt_free(struct nhlt_acpi_table *addr); +void intel_nhlt_free(struct acpi_table_nhlt *addr);
-int intel_nhlt_get_dmic_geo(struct nhlt_acpi_table *nhlt); +int intel_nhlt_get_dmic_geo(struct acpi_table_nhlt *nhlt);
#else
-struct nhlt_acpi_table; +struct acpi_table_nhlt;
-static inline struct nhlt_acpi_table *intel_nhlt_init(void) +static inline struct acpi_table_nhlt *intel_nhlt_init(void) { return NULL; }
-static inline void intel_nhlt_free(struct nhlt_acpi_table *addr) +static inline void intel_nhlt_free(struct acpi_table_nhlt *addr) { }
-static inline int intel_nhlt_get_dmic_geo(struct nhlt_acpi_table *nhlt) +static inline int intel_nhlt_get_dmic_geo(struct acpi_table_nhlt *nhlt) { return 0; } diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 60cc4735c6ec..4c9d5bc39cbd 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -379,7 +379,7 @@ static const struct config_entry *snd_intel_dsp_find_config
static int snd_intel_dsp_check_dmic(struct pci_dev *pci) { - struct nhlt_acpi_table *nhlt; + struct acpi_table_nhlt *nhlt; int ret = 0;
nhlt = intel_nhlt_init(); diff --git a/sound/hda/intel-nhlt.c b/sound/hda/intel-nhlt.c index 195d9e193a6c..c41d20e1b349 100644 --- a/sound/hda/intel-nhlt.c +++ b/sound/hda/intel-nhlt.c @@ -6,9 +6,9 @@ #include <linux/acpi.h> #include <sound/intel-nhlt.h>
-struct nhlt_acpi_table *intel_nhlt_init(void) +struct acpi_table_nhlt *intel_nhlt_init(void) { - struct nhlt_acpi_table *nhlt; + struct acpi_table_nhlt *nhlt; acpi_status status;
status = acpi_get_table(ACPI_SIG_NHLT, 0, @@ -22,13 +22,13 @@ struct nhlt_acpi_table *intel_nhlt_init(void) } EXPORT_SYMBOL_GPL(intel_nhlt_init);
-void intel_nhlt_free(struct nhlt_acpi_table *nhlt) +void intel_nhlt_free(struct acpi_table_nhlt *nhlt) { acpi_put_table((struct acpi_table_header *)nhlt); } EXPORT_SYMBOL_GPL(intel_nhlt_free);
-int intel_nhlt_get_dmic_geo(struct nhlt_acpi_table *nhlt) +int intel_nhlt_get_dmic_geo(struct acpi_table_nhlt *nhlt) { struct nhlt_endpoint *epnt; struct nhlt_dmic_array_config *cfg; diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c index 64226072f0ee..3033c1bf279f 100644 --- a/sound/soc/intel/skylake/skl-nhlt.c +++ b/sound/soc/intel/skylake/skl-nhlt.c @@ -88,7 +88,7 @@ struct nhlt_specific_cfg struct hdac_bus *bus = skl_to_bus(skl); struct device *dev = bus->dev; struct nhlt_specific_cfg *sp_config; - struct nhlt_acpi_table *nhlt = skl->nhlt; + struct acpi_table_nhlt *nhlt = skl->nhlt; u16 bps = (s_fmt == 16) ? 16 : 32; u8 j;
@@ -132,7 +132,7 @@ static void skl_nhlt_trim_space(char *trim)
int skl_nhlt_update_topology_bin(struct skl_dev *skl) { - struct nhlt_acpi_table *nhlt = (struct nhlt_acpi_table *)skl->nhlt; + struct acpi_table_nhlt *nhlt = (struct acpi_table_nhlt *)skl->nhlt; struct hdac_bus *bus = skl_to_bus(skl); struct device *dev = bus->dev;
@@ -155,7 +155,7 @@ static ssize_t platform_id_show(struct device *dev, struct pci_dev *pci = to_pci_dev(dev); struct hdac_bus *bus = pci_get_drvdata(pci); struct skl_dev *skl = bus_to_skl(bus); - struct nhlt_acpi_table *nhlt = (struct nhlt_acpi_table *)skl->nhlt; + struct acpi_table_nhlt *nhlt = (struct acpi_table_nhlt *)skl->nhlt; char platform_id[32];
sprintf(platform_id, "%x-%.6s-%.8s-%d", skl->pci_id, @@ -335,7 +335,7 @@ static void skl_get_mclk(struct skl_dev *skl, struct skl_ssp_clk *mclk,
void skl_get_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks) { - struct nhlt_acpi_table *nhlt = (struct nhlt_acpi_table *)skl->nhlt; + struct acpi_table_nhlt *nhlt = (struct acpi_table_nhlt *)skl->nhlt; struct nhlt_endpoint *epnt; struct nhlt_fmt *fmt; int i; diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h index 33ed274fc0cb..37195aafbf27 100644 --- a/sound/soc/intel/skylake/skl.h +++ b/sound/soc/intel/skylake/skl.h @@ -67,7 +67,7 @@ struct skl_dev { struct snd_soc_component *component; struct snd_soc_dai_driver *dais;
- struct nhlt_acpi_table *nhlt; /* nhlt ptr */ + struct acpi_table_nhlt *nhlt; /* nhlt ptr */
struct list_head ppl_list; struct list_head bind_list; diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 75c2ee91bf13..4a8907fe7f94 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -648,7 +648,7 @@ static int hda_init(struct snd_sof_dev *sdev)
static int check_nhlt_dmic(struct snd_sof_dev *sdev) { - struct nhlt_acpi_table *nhlt; + struct acpi_table_nhlt *nhlt; int dmic_num;
nhlt = intel_nhlt_init();