firmware: cs_dsp: Switch to using namespaced exports
Richard Fitzgerald
maintainercover firmware: cs_dsp: Switch to using namespaced exports
Use EXPORT_SYMBOL_NS_GPL() instead of EXPORT_SYMBOL_GPL() and patch the three drivers that use cs_dsp to add the MODULE_IMPORT_NS().
To make the namespace more specific the KConfig symbol for cs_dsp is changed from CS_DSP to FW_CS_DSP.
Richard Fitzgerald (2):
firmware: cs_dsp: Rename KConfig symbol CS_DSP -> FW_CS_DSP
firmware: cs_dsp: Make the exports namespaced
drivers/firmware/cirrus/Kconfig | 2 +- drivers/firmware/cirrus/Makefile | 2 +- drivers/firmware/cirrus/cs_dsp.c | 62 ++++++++++++++++---------------- sound/pci/hda/Kconfig | 2 +- sound/pci/hda/cs35l41_hda.c | 1 + sound/pci/hda/hda_cs_dsp_ctl.c | 1 + sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/wm_adsp.c | 1 + 8 files changed, 38 insertions(+), 35 deletions(-)
Signature · 1 line
2.30.2
Richard Fitzgerald
maintainerPATCH 1/2 firmware: cs_dsp: Rename KConfig symbol CS_DSP -> FW_CS_DSP
Qualify the KConfig symbol for cs_dsp by adding a FW_ prefix so that it is more explicit what is being referred to. This is preparation for using the symbol to namespace the exports.
--- drivers/firmware/cirrus/Kconfig | 2 +- drivers/firmware/cirrus/Makefile | 2 +- sound/pci/hda/Kconfig | 2 +- sound/soc/codecs/Kconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/firmware/cirrus/Kconfig +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -config CS_DSP +config FW_CS_DSP tristate default n
drivers/firmware/cirrus/Makefile +1 -1
@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 # -obj-$(CONFIG_CS_DSP) += cs_dsp.o +obj-$(CONFIG_FW_CS_DSP) += cs_dsp.o
sound/pci/hda/Kconfig +1 -1
@@ -98,7 +98,7 @@ config SND_HDA_SCODEC_CS35L41 config SND_HDA_CS_DSP_CONTROLS tristate - select CS_DSP + select FW_CS_DSP config SND_HDA_SCODEC_CS35L41_I2C tristate "Build CS35L41 HD-audio side codec support for I2C Bus"
sound/soc/codecs/Kconfig +1 -1
@@ -349,7 +349,7 @@ config SND_SOC_WM_HUBS config SND_SOC_WM_ADSP tristate - select CS_DSP + select FW_CS_DSP select SND_SOC_COMPRESS default y if SND_SOC_MADERA=y default y if SND_SOC_CS47L24=y
Signature · 1 line
2.30.2
Richard Fitzgerald
maintainerPATCH 2/2 firmware: cs_dsp: Make the exports namespaced
In reply to Richard FitzgeraldMove all the exports into a namespace.
This also adds the MODULE_IMPORT_NS to the 3 drivers that use the exported functions.
--- drivers/firmware/cirrus/cs_dsp.c | 62 ++++++++++++++++---------------- sound/pci/hda/cs35l41_hda.c | 1 + sound/pci/hda/hda_cs_dsp_ctl.c | 1 + sound/soc/codecs/wm_adsp.c | 1 + 4 files changed, 34 insertions(+), 31 deletions(-)
drivers/firmware/cirrus/cs_dsp.c +31 -31
@@ -369,7 +369,7 @@ const char *cs_dsp_mem_region_name(unsigned int type)return NULL ; } } -EXPORT_SYMBOL_GPL (cs_dsp_mem_region_name); +EXPORT_SYMBOL_NS_GPL (cs_dsp_mem_region_name,FW_CS_DSP );#ifdef CONFIG_DEBUG_FS static void cs_dsp_debugfs_save_wmfwname (struct cs_dsp *dsp,const char *s)
@@ -480,7 +480,7 @@ void cs_dsp_init_debugfs(struct cs_dsp *dsp, struct dentry *debugfs_root) dsp->debugfs_root = root; } -EXPORT_SYMBOL_GPL (cs_dsp_init_debugfs); +EXPORT_SYMBOL_NS_GPL (cs_dsp_init_debugfs,FW_CS_DSP );/** * cs_dsp_cleanup_debugfs() - Removes DSP representation from debugfs
@@ -492,17 +492,17 @@ void cs_dsp_cleanup_debugfs(struct cs_dsp *dsp)debugfs_remove_recursive (dsp->debugfs_root); dsp->debugfs_root = NULL; } -EXPORT_SYMBOL_GPL (cs_dsp_cleanup_debugfs); +EXPORT_SYMBOL_NS_GPL (cs_dsp_cleanup_debugfs,FW_CS_DSP );#else void cs_dsp_init_debugfs (struct cs_dsp *dsp,struct dentry *debugfs_root) { } -EXPORT_SYMBOL_GPL (cs_dsp_init_debugfs); +EXPORT_SYMBOL_NS_GPL (cs_dsp_init_debugfs,FW_CS_DSP );void cs_dsp_cleanup_debugfs (struct cs_dsp *dsp) { } -EXPORT_SYMBOL_GPL (cs_dsp_cleanup_debugfs); +EXPORT_SYMBOL_NS_GPL (cs_dsp_cleanup_debugfs,FW_CS_DSP );static inline void cs_dsp_debugfs_save_wmfwname (struct cs_dsp *dsp,const char *s)
@@ -710,7 +710,7 @@ int cs_dsp_coeff_write_acked_control(struct cs_dsp_coeff_ctl *ctl, unsigned intreturn -ETIMEDOUT ; } -EXPORT_SYMBOL_GPL (cs_dsp_coeff_write_acked_control); +EXPORT_SYMBOL_NS_GPL (cs_dsp_coeff_write_acked_control,FW_CS_DSP );static int cs_dsp_coeff_write_ctrl_raw (struct cs_dsp_coeff_ctl *ctl,unsigned int off,const void *buf,size_t len)
@@ -778,7 +778,7 @@ int cs_dsp_coeff_write_ctrl(struct cs_dsp_coeff_ctl *ctl,return ret; } -EXPORT_SYMBOL_GPL (cs_dsp_coeff_write_ctrl); +EXPORT_SYMBOL_NS_GPL (cs_dsp_coeff_write_ctrl,FW_CS_DSP );static int cs_dsp_coeff_read_ctrl_raw (struct cs_dsp_coeff_ctl *ctl,unsigned int off,void *buf,size_t len)
@@ -850,7 +850,7 @@ int cs_dsp_coeff_read_ctrl(struct cs_dsp_coeff_ctl *ctl,return ret; } -EXPORT_SYMBOL_GPL (cs_dsp_coeff_read_ctrl); +EXPORT_SYMBOL_NS_GPL (cs_dsp_coeff_read_ctrl,FW_CS_DSP );static int cs_dsp_coeff_init_control_caches (struct cs_dsp *dsp) {
@@ -1493,7 +1493,7 @@ struct cs_dsp_coeff_ctl *cs_dsp_get_ctl(struct cs_dsp *dsp, const char *name, inreturn rslt; } -EXPORT_SYMBOL_GPL (cs_dsp_get_ctl); +EXPORT_SYMBOL_NS_GPL (cs_dsp_get_ctl,FW_CS_DSP );static void cs_dsp_ctl_fixup_base (struct cs_dsp *dsp,const struct cs_dsp_alg_region *alg_region)
@@ -1583,7 +1583,7 @@ struct cs_dsp_alg_region *cs_dsp_find_alg_region(struct cs_dsp *dsp,return NULL ; } -EXPORT_SYMBOL_GPL (cs_dsp_find_alg_region); +EXPORT_SYMBOL_NS_GPL (cs_dsp_find_alg_region,FW_CS_DSP ); static struct cs_dsp_alg_region *cs_dsp_create_region(struct cs_dsp *dsp, int type, __be32 id,
@@ -2217,7 +2217,7 @@ int cs_dsp_adsp1_init(struct cs_dsp *dsp)return cs_dsp_common_init (dsp); } -EXPORT_SYMBOL_GPL (cs_dsp_adsp1_init); +EXPORT_SYMBOL_NS_GPL (cs_dsp_adsp1_init,FW_CS_DSP );/** * cs_dsp_adsp1_power_up() - Load and start the named firmware
@@ -2309,7 +2309,7 @@ int cs_dsp_adsp1_power_up(struct cs_dsp *dsp,mutex_unlock (&dsp->pwr_lock);return ret; } -EXPORT_SYMBOL_GPL (cs_dsp_adsp1_power_up); +EXPORT_SYMBOL_NS_GPL (cs_dsp_adsp1_power_up,FW_CS_DSP );/** * cs_dsp_adsp1_power_down() - Halts the DSP
@@ -2341,7 +2341,7 @@ void cs_dsp_adsp1_power_down(struct cs_dsp *dsp)mutex_unlock (&dsp->pwr_lock); } -EXPORT_SYMBOL_GPL (cs_dsp_adsp1_power_down); +EXPORT_SYMBOL_NS_GPL (cs_dsp_adsp1_power_down,FW_CS_DSP );static int cs_dsp_adsp2v2_enable_core (struct cs_dsp *dsp) {
@@ -2493,7 +2493,7 @@ int cs_dsp_set_dspclk(struct cs_dsp *dsp, unsigned int freq)return ret; } -EXPORT_SYMBOL_GPL (cs_dsp_set_dspclk); +EXPORT_SYMBOL_NS_GPL (cs_dsp_set_dspclk,FW_CS_DSP );static void cs_dsp_stop_watchdog (struct cs_dsp *dsp) {
@@ -2583,7 +2583,7 @@ int cs_dsp_power_up(struct cs_dsp *dsp,return ret; } -EXPORT_SYMBOL_GPL (cs_dsp_power_up); +EXPORT_SYMBOL_NS_GPL (cs_dsp_power_up,FW_CS_DSP );/** * cs_dsp_power_down() - Powers-down the DSP
@@ -2617,7 +2617,7 @@ void cs_dsp_power_down(struct cs_dsp *dsp)cs_dsp_dbg (dsp,"Shutdown complete\n" ); } -EXPORT_SYMBOL_GPL (cs_dsp_power_down); +EXPORT_SYMBOL_NS_GPL (cs_dsp_power_down,FW_CS_DSP );static int cs_dsp_adsp2_start_core (struct cs_dsp *dsp) {
@@ -2703,7 +2703,7 @@ int cs_dsp_run(struct cs_dsp *dsp)return ret; } -EXPORT_SYMBOL_GPL (cs_dsp_run); +EXPORT_SYMBOL_NS_GPL (cs_dsp_run,FW_CS_DSP );/** * cs_dsp_stop() - Stops the firmware
@@ -2742,7 +2742,7 @@ void cs_dsp_stop(struct cs_dsp *dsp)cs_dsp_dbg (dsp,"Execution stopped\n" ); } -EXPORT_SYMBOL_GPL (cs_dsp_stop); +EXPORT_SYMBOL_NS_GPL (cs_dsp_stop,FW_CS_DSP );static int cs_dsp_halo_start_core (struct cs_dsp *dsp) {
@@ -2804,7 +2804,7 @@ int cs_dsp_adsp2_init(struct cs_dsp *dsp)return cs_dsp_common_init (dsp); } -EXPORT_SYMBOL_GPL (cs_dsp_adsp2_init); +EXPORT_SYMBOL_NS_GPL (cs_dsp_adsp2_init,FW_CS_DSP );/** * cs_dsp_halo_init() - Initialise a cs_dsp structure representing a HALO Core DSP
@@ -2818,7 +2818,7 @@ int cs_dsp_halo_init(struct cs_dsp *dsp)return cs_dsp_common_init (dsp); } -EXPORT_SYMBOL_GPL (cs_dsp_halo_init); +EXPORT_SYMBOL_NS_GPL (cs_dsp_halo_init,FW_CS_DSP );/** * cs_dsp_remove() - Clean a cs_dsp before deletion
@@ -2838,7 +2838,7 @@ void cs_dsp_remove(struct cs_dsp *dsp)cs_dsp_free_ctl_blk (ctl); } } -EXPORT_SYMBOL_GPL (cs_dsp_remove); +EXPORT_SYMBOL_NS_GPL (cs_dsp_remove,FW_CS_DSP );/** * cs_dsp_read_raw_data_block() - Reads a block of data from DSP memory
@@ -2875,7 +2875,7 @@ int cs_dsp_read_raw_data_block(struct cs_dsp *dsp, int mem_type, unsigned int mereturn 0 ; } -EXPORT_SYMBOL_GPL (cs_dsp_read_raw_data_block); +EXPORT_SYMBOL_NS_GPL (cs_dsp_read_raw_data_block,FW_CS_DSP );/** * cs_dsp_read_data_word() - Reads a word from DSP memory
@@ -2899,7 +2899,7 @@ int cs_dsp_read_data_word(struct cs_dsp *dsp, int mem_type, unsigned int mem_addreturn 0 ; } -EXPORT_SYMBOL_GPL (cs_dsp_read_data_word); +EXPORT_SYMBOL_NS_GPL (cs_dsp_read_data_word,FW_CS_DSP );/** * cs_dsp_write_data_word() - Writes a word to DSP memory
@@ -2925,7 +2925,7 @@ int cs_dsp_write_data_word(struct cs_dsp *dsp, int mem_type, unsigned int mem_adreturn regmap_raw_write (dsp->regmap, reg, &val,sizeof (val)); } -EXPORT_SYMBOL_GPL (cs_dsp_write_data_word); +EXPORT_SYMBOL_NS_GPL (cs_dsp_write_data_word,FW_CS_DSP );/** * cs_dsp_remove_padding() - Convert unpacked words to packed bytes
@@ -2949,7 +2949,7 @@ void cs_dsp_remove_padding(u32 *buf, int nwords) *pack_out++ = (u8)(word >>16 ); } } -EXPORT_SYMBOL_GPL (cs_dsp_remove_padding); +EXPORT_SYMBOL_NS_GPL (cs_dsp_remove_padding,FW_CS_DSP );/** * cs_dsp_adsp2_bus_error() - Handle a DSP bus error interrupt
@@ -3019,7 +3019,7 @@ void cs_dsp_adsp2_bus_error(struct cs_dsp *dsp) error:mutex_unlock (&dsp->pwr_lock); } -EXPORT_SYMBOL_GPL (cs_dsp_adsp2_bus_error); +EXPORT_SYMBOL_NS_GPL (cs_dsp_adsp2_bus_error,FW_CS_DSP );/** * cs_dsp_halo_bus_error() - Handle a DSP bus error interrupt
@@ -3079,7 +3079,7 @@ void cs_dsp_halo_bus_error(struct cs_dsp *dsp) exit_unlock:mutex_unlock (&dsp->pwr_lock); } -EXPORT_SYMBOL_GPL (cs_dsp_halo_bus_error); +EXPORT_SYMBOL_NS_GPL (cs_dsp_halo_bus_error,FW_CS_DSP );/** * cs_dsp_halo_wdt_expire() - Handle DSP watchdog expiry
@@ -3099,7 +3099,7 @@ void cs_dsp_halo_wdt_expire(struct cs_dsp *dsp)mutex_unlock (&dsp->pwr_lock); } -EXPORT_SYMBOL_GPL (cs_dsp_halo_wdt_expire); +EXPORT_SYMBOL_NS_GPL (cs_dsp_halo_wdt_expire,FW_CS_DSP );static const struct cs_dsp_ops cs_dsp_adsp1_ops = { .validate_version = cs_dsp_validate_version,
@@ -3221,7 +3221,7 @@ int cs_dsp_chunk_write(struct cs_dsp_chunk *ch, int nbits, u32 val)return 0 ; } -EXPORT_SYMBOL_GPL (cs_dsp_chunk_write); +EXPORT_SYMBOL_NS_GPL (cs_dsp_chunk_write,FW_CS_DSP );/** * cs_dsp_chunk_flush() - Pad remaining data with zero and commit to chunk
@@ -3240,7 +3240,7 @@ int cs_dsp_chunk_flush(struct cs_dsp_chunk *ch)return cs_dsp_chunk_write (ch,CS_DSP_DATA_WORD_BITS - ch->cachebits,0 ); } -EXPORT_SYMBOL_GPL (cs_dsp_chunk_flush); +EXPORT_SYMBOL_NS_GPL (cs_dsp_chunk_flush,FW_CS_DSP );/** * cs_dsp_chunk_read() - Parse data from a DSP memory chunk
@@ -3282,7 +3282,7 @@ int cs_dsp_chunk_read(struct cs_dsp_chunk *ch, int nbits)return result; } -EXPORT_SYMBOL_GPL (cs_dsp_chunk_read); +EXPORT_SYMBOL_NS_GPL (cs_dsp_chunk_read,FW_CS_DSP );MODULE_DESCRIPTION ("Cirrus Logic DSP Support" );MODULE_AUTHOR ("Simon Trimmer <[email protected]>" );
sound/pci/hda/cs35l41_hda.c +1 -0
@@ -1545,3 +1545,4 @@ MODULE_DESCRIPTION("CS35L41 HDA Driver");MODULE_IMPORT_NS (SND_HDA_CS_DSP_CONTROLS );MODULE_AUTHOR ("Lucas Tanure, Cirrus Logic Inc, <[email protected]>" );MODULE_LICENSE ("GPL" ); +MODULE_IMPORT_NS (FW_CS_DSP );
sound/pci/hda/hda_cs_dsp_ctl.c +1 -0
@@ -249,3 +249,4 @@ EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_read_ctl, SND_HDA_CS_DSP_CONTROLS);MODULE_DESCRIPTION ("CS_DSP ALSA Control HDA Library" );MODULE_AUTHOR ("Stefan Binding, <[email protected]>" );MODULE_LICENSE ("GPL" ); +MODULE_IMPORT_NS (FW_CS_DSP );
sound/soc/codecs/wm_adsp.c +1 -0
@@ -2060,3 +2060,4 @@ static const struct cs_dsp_client_ops wm_adsp2_client_ops = { };MODULE_LICENSE ("GPL v2" ); +MODULE_IMPORT_NS (FW_CS_DSP );
Signature · 1 line
2.30.2
Mark Brown
maintainerQuoted 11 lines · Richard Fitzgerald
Use
EXPORT_SYMBOL_NS_GPL()instead ofEXPORT_SYMBOL_GPL()and patch the three drivers that usecs_dspto add theMODULE_IMPORT_NS().To make the namespace more specific the KConfig symbol for
cs_dspis changed fromCS_DSPtoFW_CS_DSP.Richard Fitzgerald (2):
firmware:cs_dsp: Rename KConfig symbolCS_DSP->FW_CS_DSP
firmware:cs_dsp: Make the exports namespaced[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] firmware: cs_dsp: Rename KConfig symbol CS_DSP -> FW_CS_DSP
commit: d7cfdf17cb9d072b41547e7cc882ecd900aa6589
[2/2] firmware: cs_dsp: Make the exports namespaced
commit: e57d904ac4be6de7ecc9083f51a9a38f72482f82All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark