Skip to content

ASoC: Intel: Use proper namespace identifiers #5410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
naveen-manohar wants to merge 3 commits into from
Closed

ASoC: Intel: Use proper namespace identifiers #5410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7545f9
[DONOT_MERGE] fixup! UPSTREAM: ASoC: SOF: Intel: hda-sdw-bpt: add hel…
naveen-manohar May 9, 2025
d6f22af
[DONOT_MERGE] fixup! UPSTREAM: ASoC: SOF: Intel: hda-mlink: Add suppo…
naveen-manohar May 9, 2025
dd34212
[DONOT_MERGE] fixup! UPSTREAM: ASoC: SOF: Intel: mtl: Split up dsp_op…
naveen-manohar May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sound/soc/sof/intel/hda-mlink.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Copy Markdown
Collaborator

@ujfalusi ujfalusi May 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is not correct, see:
cdd30eb ("module: Convert symbol namespace to string literal")

Copy link
Copy Markdown
Collaborator

@bardliao bardliao May 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@naveen-manohar This is only for your 6.12 kernel, not for topic/sof-dev branch

Copy link
Copy Markdown
Author

@naveen-manohar naveen-manohar May 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ujfalusi Thanks for the info.
As the build fails on v6.12, for now i have posted a DONOT_MERGE series


bool hdac_bus_eml_is_mic_privacy_changed(struct hdac_bus *bus, bool alt, int elid)
{
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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

Expand Down
12 changes: 6 additions & 6 deletions sound/soc/sof/intel/hda-sdw-bpt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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);
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/mtl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading