From a7545f93c34bbc31d024b20dcd5986bee4db636f Mon Sep 17 00:00:00 2001 From: Naveen Manohar Date: Fri, 9 May 2025 12:06:30 +0530 Subject: [PATCH 1/3] [DONOT_MERGE] fixup! UPSTREAM: ASoC: SOF: Intel: hda-sdw-bpt: add helpers for SoundWire BPT DMA Patch Applicable only on v6.12 'EXPORT_SYMBOL_NS' expects namespace identifier directly, not as a string literal. Patch Fixes: ERROR: modpost: module snd-sof-intel-hda-sdw-bpt uses symbol hdac_bus_eml_sdw_map_stream_ch from namespace SND_SOC_SOF_HDA_MLINK, but does not import it. ERROR: modpost: module snd-sof-intel-hda-sdw-bpt uses symbol hda_cl_prepare from namespace SND_SOC_SOF_INTEL_HDA_COMMON, but does not import it. ERROR: modpost: module snd-sof-intel-hda-sdw-bpt uses symbol hdac_bus_eml_sdw_get_hlink from namespace SND_SOC_SOF_HDA_MLINK, but does not import it. ERROR: modpost: module snd-sof-intel-hda-sdw-bpt uses symbol hda_cl_cleanup from namespace SND_SOC_SOF_INTEL_HDA_COMMON, but does not import it. ERROR: modpost: module snd-sof-intel-hda-sdw-bpt uses symbol hda_cl_trigger from namespace SND_SOC_SOF_INTEL_HDA_COMMON, but does not import it. ERROR: modpost: module snd-sof-intel-hda-sdw-bpt uses symbol hda_dsp_stream_get_position from namespace SND_SOC_SOF_INTEL_HDA_COMMON, but does not import it. Patch updates macro calls in `sound/soc/sof/intel/da-sdw-bpt.c` Fixes: 5d5cb86fb46e ("ASoC: SOF: Intel: hda-sdw-bpt: add helpers for SoundWire BPT DMA") Suggested-by: Bard Liao Signed-off-by: Naveen Manohar --- sound/soc/sof/intel/hda-sdw-bpt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/sof/intel/hda-sdw-bpt.c b/sound/soc/sof/intel/hda-sdw-bpt.c index 1327f1cad0bcd9..2bdd662f133f8f 100644 --- a/sound/soc/sof/intel/hda-sdw-bpt.c +++ b/sound/soc/sof/intel/hda-sdw-bpt.c @@ -304,7 +304,7 @@ int hda_sdw_bpt_open(struct device *dev, int link_id, struct hdac_ext_stream **b return ret; } -EXPORT_SYMBOL_NS(hda_sdw_bpt_open, "SND_SOC_SOF_INTEL_HDA_SDW_BPT"); +EXPORT_SYMBOL_NS(hda_sdw_bpt_open, SND_SOC_SOF_INTEL_HDA_SDW_BPT); int hda_sdw_bpt_send_async(struct device *dev, struct hdac_ext_stream *bpt_tx_stream, struct hdac_ext_stream *bpt_rx_stream) @@ -332,7 +332,7 @@ int hda_sdw_bpt_send_async(struct device *dev, struct hdac_ext_stream *bpt_tx_st return ret; } -EXPORT_SYMBOL_NS(hda_sdw_bpt_send_async, "SND_SOC_SOF_INTEL_HDA_SDW_BPT"); +EXPORT_SYMBOL_NS(hda_sdw_bpt_send_async, SND_SOC_SOF_INTEL_HDA_SDW_BPT); /* * 3s is several orders of magnitude larger than what is needed for a @@ -420,7 +420,7 @@ int hda_sdw_bpt_wait(struct device *dev, struct hdac_ext_stream *bpt_tx_stream, return ret; } -EXPORT_SYMBOL_NS(hda_sdw_bpt_wait, "SND_SOC_SOF_INTEL_HDA_SDW_BPT"); +EXPORT_SYMBOL_NS(hda_sdw_bpt_wait, SND_SOC_SOF_INTEL_HDA_SDW_BPT); int hda_sdw_bpt_close(struct device *dev, struct hdac_ext_stream *bpt_tx_stream, struct snd_dma_buffer *dmab_tx_bdl, struct hdac_ext_stream *bpt_rx_stream, @@ -437,9 +437,9 @@ int hda_sdw_bpt_close(struct device *dev, struct hdac_ext_stream *bpt_tx_stream, return ret; } -EXPORT_SYMBOL_NS(hda_sdw_bpt_close, "SND_SOC_SOF_INTEL_HDA_SDW_BPT"); +EXPORT_SYMBOL_NS(hda_sdw_bpt_close, SND_SOC_SOF_INTEL_HDA_SDW_BPT); MODULE_LICENSE("Dual BSD/GPL"); MODULE_DESCRIPTION("SOF helpers for HDaudio SoundWire BPT"); -MODULE_IMPORT_NS("SND_SOC_SOF_INTEL_HDA_COMMON"); -MODULE_IMPORT_NS("SND_SOC_SOF_HDA_MLINK"); +MODULE_IMPORT_NS(SND_SOC_SOF_INTEL_HDA_COMMON); +MODULE_IMPORT_NS(SND_SOC_SOF_HDA_MLINK); From d6f22af0961b52f471f98f310cae08b5985a6296 Mon Sep 17 00:00:00 2001 From: Naveen Manohar Date: Fri, 9 May 2025 11:59:11 +0530 Subject: [PATCH 2/3] [DONOT_MERGE] fixup! UPSTREAM: ASoC: SOF: Intel: hda-mlink: Add support for mic privacy in VS SHIM registers Patch Applicable only on v6.12 'EXPORT_SYMBOL_NS' expects namespace identifier directly, not as a string literal. Patch Fixes: sound/soc/sof/intel/snd-sof-intel-hda-mlink.mod.c:49:55: error: expected ')' Patch updates macro calls in `sound/soc/sof/intel/hda-mlink.c` Fixes: 0978e8207b61 ("ASoC: SOF: Intel: hda-mlink: Add support for mic privacy in VS SHIM registers") Signed-off-by: Naveen Manohar --- sound/soc/sof/intel/hda-mlink.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/sof/intel/hda-mlink.c b/sound/soc/sof/intel/hda-mlink.c index ce561fe52bd5d4..f74b5d5a7bed1c 100644 --- a/sound/soc/sof/intel/hda-mlink.c +++ b/sound/soc/sof/intel/hda-mlink.c @@ -1046,7 +1046,7 @@ void hdac_bus_eml_set_mic_privacy_mask(struct hdac_bus *bus, bool alt, int elid, h2link->mic_privacy_mask = mask; } -EXPORT_SYMBOL_NS(hdac_bus_eml_set_mic_privacy_mask, "SND_SOC_SOF_HDA_MLINK"); +EXPORT_SYMBOL_NS(hdac_bus_eml_set_mic_privacy_mask, SND_SOC_SOF_HDA_MLINK); bool hdac_bus_eml_is_mic_privacy_changed(struct hdac_bus *bus, bool alt, int elid) { @@ -1080,7 +1080,7 @@ bool hdac_bus_eml_is_mic_privacy_changed(struct hdac_bus *bus, bool alt, int eli return changed; } -EXPORT_SYMBOL_NS(hdac_bus_eml_is_mic_privacy_changed, "SND_SOC_SOF_HDA_MLINK"); +EXPORT_SYMBOL_NS(hdac_bus_eml_is_mic_privacy_changed, SND_SOC_SOF_HDA_MLINK); bool hdac_bus_eml_get_mic_privacy_state(struct hdac_bus *bus, bool alt, int elid) { @@ -1112,7 +1112,7 @@ bool hdac_bus_eml_get_mic_privacy_state(struct hdac_bus *bus, bool alt, int elid return false; } -EXPORT_SYMBOL_NS(hdac_bus_eml_get_mic_privacy_state, "SND_SOC_SOF_HDA_MLINK"); +EXPORT_SYMBOL_NS(hdac_bus_eml_get_mic_privacy_state, SND_SOC_SOF_HDA_MLINK); #endif From dd342129d87495d63508e691a63d06d5a35f747e Mon Sep 17 00:00:00 2001 From: Naveen Manohar Date: Fri, 9 May 2025 12:12:53 +0530 Subject: [PATCH 3/3] [DONOT_MERGE] fixup! UPSTREAM: ASoC: SOF: Intel: mtl: Split up dsp_ops setup code Patch Applicable only on v6.12 'EXPORT_SYMBOL_NS' expects namespace identifier directly, not as a string literal. Patch Fixes: sound/soc/sof/intel/snd-sof-pci-intel-mtl.mod.c:34:37: error: expected ')' Patch updates macro calls in `sound/soc/sof/intel/mtl.c` Fixes: 698233342000 ("ASoC: SOF: Intel: mtl: Split up dsp_ops setup code") Signed-off-by: Naveen Manohar --- sound/soc/sof/intel/mtl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/intel/mtl.c b/sound/soc/sof/intel/mtl.c index 657c7a1626d185..dcae0e2f8c3c3c 100644 --- a/sound/soc/sof/intel/mtl.c +++ b/sound/soc/sof/intel/mtl.c @@ -761,7 +761,7 @@ int sof_mtl_set_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *dsp_ops) return 0; } -EXPORT_SYMBOL_NS(sof_mtl_set_ops, "SND_SOC_SOF_INTEL_MTL"); +EXPORT_SYMBOL_NS(sof_mtl_set_ops, SND_SOC_SOF_INTEL_MTL); const struct sof_intel_dsp_desc mtl_chip_info = { .cores_num = 3,