On 10/15/21 11:40 AM, Cezary Rojewski wrote:
> From: Amadeusz Sławiński <amadeuszx.slawinski@xxxxxxxxxxxxxxx>
>
> ACPI is device independent, so printing warnings using device functions
> is misleading. Replace dev_xxx() with pr_xxx() and remove now
> unnecessary argument.
the routines in sound/hda/intel-nhtl.c are called from a specific PCI
device, why would you remove that information?
This makes no sense to me.
>
> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@xxxxxxxxxxxxxxx>
> Signed-off-by: Cezary Rojewski <cezary.rojewski@xxxxxxxxx>
> ---
> include/sound/intel-nhlt.h | 9 ++++-----
> sound/hda/intel-dsp-config.c | 4 ++--
> sound/hda/intel-nhlt.c | 24 +++++++++++++-----------
> sound/soc/intel/skylake/skl.c | 5 ++---
> sound/soc/sof/intel/hda.c | 4 ++--
> 5 files changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/include/sound/intel-nhlt.h b/include/sound/intel-nhlt.h
> index d0574805865f..4debab7c1996 100644
> --- a/include/sound/intel-nhlt.h
> +++ b/include/sound/intel-nhlt.h
> @@ -126,17 +126,17 @@ enum {
> NHLT_MIC_ARRAY_VENDOR_DEFINED = 0xf,
> };
>
> -struct nhlt_acpi_table *intel_nhlt_init(struct device *dev);
> +struct nhlt_acpi_table *intel_nhlt_init(void);
>
> void intel_nhlt_free(struct nhlt_acpi_table *addr);
>
> -int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt);
> +int intel_nhlt_get_dmic_geo(struct nhlt_acpi_table *nhlt);
>
> #else
>
> struct nhlt_acpi_table;
>
> -static inline struct nhlt_acpi_table *intel_nhlt_init(struct device *dev)
> +static inline struct nhlt_acpi_table *intel_nhlt_init(void)
> {
> return NULL;
> }
> @@ -145,8 +145,7 @@ static inline void intel_nhlt_free(struct nhlt_acpi_table *addr)
> {
> }
>
> -static inline int intel_nhlt_get_dmic_geo(struct device *dev,
> - struct nhlt_acpi_table *nhlt)
> +static inline int intel_nhlt_get_dmic_geo(struct nhlt_acpi_table *nhlt)
> {
> return 0;
> }
> diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c
> index b9ac9e9e45a4..60cc4735c6ec 100644
> --- a/sound/hda/intel-dsp-config.c
> +++ b/sound/hda/intel-dsp-config.c
> @@ -382,9 +382,9 @@ static int snd_intel_dsp_check_dmic(struct pci_dev *pci)
> struct nhlt_acpi_table *nhlt;
> int ret = 0;
>
> - nhlt = intel_nhlt_init(&pci->dev);
> + nhlt = intel_nhlt_init();
> if (nhlt) {
> - if (intel_nhlt_get_dmic_geo(&pci->dev, nhlt))
> + if (intel_nhlt_get_dmic_geo(nhlt))
> ret = 1;
> intel_nhlt_free(nhlt);
> }
> diff --git a/sound/hda/intel-nhlt.c b/sound/hda/intel-nhlt.c
> index e2237239d922..195d9e193a6c 100644
> --- a/sound/hda/intel-nhlt.c
> +++ b/sound/hda/intel-nhlt.c
> @@ -1,10 +1,12 @@
> // SPDX-License-Identifier: GPL-2.0-only
> // Copyright (c) 2015-2019 Intel Corporation
>
> +#define pr_fmt(fmt) "NHLT: " fmt
> +
> #include <linux/acpi.h>
> #include <sound/intel-nhlt.h>
>
> -struct nhlt_acpi_table *intel_nhlt_init(struct device *dev)
> +struct nhlt_acpi_table *intel_nhlt_init(void)
> {
> struct nhlt_acpi_table *nhlt;
> acpi_status status;
> @@ -12,7 +14,7 @@ struct nhlt_acpi_table *intel_nhlt_init(struct device *dev)
> status = acpi_get_table(ACPI_SIG_NHLT, 0,
> (struct acpi_table_header **)&nhlt);
> if (ACPI_FAILURE(status)) {
> - dev_warn(dev, "NHLT table not found\n");
> + pr_warn("NHLT table not found\n");
> return NULL;
> }
>
> @@ -26,7 +28,7 @@ void intel_nhlt_free(struct nhlt_acpi_table *nhlt)
> }
> EXPORT_SYMBOL_GPL(intel_nhlt_free);
>
> -int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt)
> +int intel_nhlt_get_dmic_geo(struct nhlt_acpi_table *nhlt)
> {
> struct nhlt_endpoint *epnt;
> struct nhlt_dmic_array_config *cfg;
> @@ -40,7 +42,7 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt)
> return 0;
>
> if (nhlt->header.length <= sizeof(struct acpi_table_header)) {
> - dev_warn(dev, "Invalid DMIC description table\n");
> + pr_warn("Invalid DMIC description table\n");
> return 0;
> }
>
> @@ -55,7 +57,7 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt)
>
> /* find max number of channels based on format_configuration */
> if (fmt_configs->fmt_count) {
> - dev_dbg(dev, "%s: found %d format definitions\n",
> + pr_debug("%s: found %d format definitions\n",
> __func__, fmt_configs->fmt_count);
>
> for (i = 0; i < fmt_configs->fmt_count; i++) {
> @@ -66,9 +68,9 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt)
> if (fmt_ext->fmt.channels > max_ch)
> max_ch = fmt_ext->fmt.channels;
> }
> - dev_dbg(dev, "%s: max channels found %d\n", __func__, max_ch);
> + pr_debug("%s: max channels found %d\n", __func__, max_ch);
> } else {
> - dev_dbg(dev, "%s: No format information found\n", __func__);
> + pr_debug("%s: No format information found\n", __func__);
> }
>
> if (cfg->device_config.config_type != NHLT_CONFIG_TYPE_MIC_ARRAY) {
> @@ -90,21 +92,21 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt)
> dmic_geo = cfg_vendor->nb_mics;
> break;
> default:
> - dev_warn(dev, "%s: undefined DMIC array_type 0x%0x\n",
> + pr_warn("%s: undefined DMIC array_type 0x%0x\n",
> __func__, cfg->array_type);
> }
>
> if (dmic_geo > 0) {
> - dev_dbg(dev, "%s: Array with %d dmics\n", __func__, dmic_geo);
> + pr_debug("%s: Array with %d dmics\n", __func__, dmic_geo);
> }
> if (max_ch > dmic_geo) {
> - dev_dbg(dev, "%s: max channels %d exceed dmic number %d\n",
> + pr_debug("%s: max channels %d exceed dmic number %d\n",
> __func__, max_ch, dmic_geo);
> }
> }
> }
>
> - dev_dbg(dev, "%s: dmic number %d max_ch %d\n",
> + pr_debug("%s: dmic number %d max_ch %d\n",
> __func__, dmic_geo, max_ch);
>
> return dmic_geo;
> diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
> index 5b1a15e39912..4f122616b636 100644
> --- a/sound/soc/intel/skylake/skl.c
> +++ b/sound/soc/intel/skylake/skl.c
> @@ -517,8 +517,7 @@ static int skl_find_machine(struct skl_dev *skl, void *driver_data)
> if (pdata) {
> skl->use_tplg_pcm = pdata->use_tplg_pcm;
> mach->mach_params.dmic_num =
> - intel_nhlt_get_dmic_geo(&skl->pci->dev,
> - skl->nhlt);
> + intel_nhlt_get_dmic_geo(skl->nhlt);
> }
>
> return 0;
> @@ -1009,7 +1008,7 @@ static int skl_probe(struct pci_dev *pci,
>
> device_disable_async_suspend(bus->dev);
>
> - skl->nhlt = intel_nhlt_init(bus->dev);
> + skl->nhlt = intel_nhlt_init();
>
> if (skl->nhlt == NULL) {
> #if !IS_ENABLED(CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC)
> diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
> index 883d78dd01b5..75c2ee91bf13 100644
> --- a/sound/soc/sof/intel/hda.c
> +++ b/sound/soc/sof/intel/hda.c
> @@ -651,9 +651,9 @@ static int check_nhlt_dmic(struct snd_sof_dev *sdev)
> struct nhlt_acpi_table *nhlt;
> int dmic_num;
>
> - nhlt = intel_nhlt_init(sdev->dev);
> + nhlt = intel_nhlt_init();
> if (nhlt) {
> - dmic_num = intel_nhlt_get_dmic_geo(sdev->dev, nhlt);
> + dmic_num = intel_nhlt_get_dmic_geo(nhlt);
> intel_nhlt_free(nhlt);
> if (dmic_num >= 1 && dmic_num <= 4)
> return dmic_num;
>
