Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: SDCA: Pull HID and IRQ into the primary SDCA module 

If the HID or the IRQ are selected as options they will always require
loading alongside the main SDCA module. Since it will never be possible
to run without them the value of keeping them as separate modules is
fairly limited. Pull them into the main SDCA module to simplify things
still further.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patch.msgid.link/20250711100616.296329-3-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2025-07-11 11:06:16 +01:00 committed by Mark Brown
parent 6894e49b7b
commit 5030abcb0a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/sdca/Makefile
View File

@ -1,13 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
snd-soc-sdca-y := sdca_functions.o sdca_device.o sdca_regmap.o sdca_asoc.o snd-soc-sdca-y := sdca_functions.o sdca_device.o sdca_regmap.o sdca_asoc.o
snd-soc-sdca-hid-y := sdca_hid.o snd-soc-sdca-$(CONFIG_SND_SOC_SDCA_HID) += sdca_hid.o
snd-soc-sdca-irq-y := sdca_interrupts.o snd-soc-sdca-$(CONFIG_SND_SOC_SDCA_IRQ) += sdca_interrupts.o
obj-$(CONFIG_SND_SOC_SDCA) += snd-soc-sdca.o obj-$(CONFIG_SND_SOC_SDCA) += snd-soc-sdca.o
ifdef CONFIG_SND_SOC_SDCA_HID
obj-$(CONFIG_SND_SOC_SDCA) += snd-soc-sdca-hid.o
endif
ifdef CONFIG_SND_SOC_SDCA_IRQ
obj-$(CONFIG_SND_SOC_SDCA) += snd-soc-sdca-irq.o
endif

1
sound/soc/sdca/sdca_functions.c
View File

@ -1943,4 +1943,3 @@ EXPORT_SYMBOL_NS(sdca_parse_function, "SND_SOC_SDCA");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("SDCA library"); MODULE_DESCRIPTION("SDCA library");
MODULE_IMPORT_NS("SND_SOC_SDCA_HID");

2
sound/soc/sdca/sdca_hid.c
View File

@ -121,7 +121,7 @@ int sdca_add_hid_device(struct device *dev, struct sdca_entity *entity)
return 0; return 0;
} }
EXPORT_SYMBOL_NS(sdca_add_hid_device, "SND_SOC_SDCA_HID"); EXPORT_SYMBOL_NS(sdca_add_hid_device, "SND_SOC_SDCA");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("SDCA HID library"); MODULE_DESCRIPTION("SDCA HID library");

8
sound/soc/sdca/sdca_interrupts.c
View File

@ -279,7 +279,7 @@ int sdca_irq_request(struct device *dev, struct sdca_interrupt_info *info,
return 0; return 0;
} }
EXPORT_SYMBOL_NS_GPL(sdca_irq_request, "SND_SOC_SDCA_IRQ"); EXPORT_SYMBOL_NS_GPL(sdca_irq_request, "SND_SOC_SDCA");
/** /**
* sdca_irq_data_populate - Populate common interrupt data * sdca_irq_data_populate - Populate common interrupt data
@ -313,7 +313,7 @@ int sdca_irq_data_populate(struct snd_soc_component *component,
return 0; return 0;
} }
EXPORT_SYMBOL_NS_GPL(sdca_irq_data_populate, "SND_SOC_SDCA_IRQ"); EXPORT_SYMBOL_NS_GPL(sdca_irq_data_populate, "SND_SOC_SDCA");
/** /**
* sdca_irq_populate - Request all the individual IRQs for an SDCA Function * sdca_irq_populate - Request all the individual IRQs for an SDCA Function
@ -393,7 +393,7 @@ int sdca_irq_populate(struct sdca_function_data *function,
return 0; return 0;
} }
EXPORT_SYMBOL_NS_GPL(sdca_irq_populate, "SND_SOC_SDCA_IRQ"); EXPORT_SYMBOL_NS_GPL(sdca_irq_populate, "SND_SOC_SDCA");
/** /**
* sdca_irq_allocate - allocate an SDCA interrupt structure for a device * sdca_irq_allocate - allocate an SDCA interrupt structure for a device
@ -433,7 +433,7 @@ struct sdca_interrupt_info *sdca_irq_allocate(struct device *dev,
return info; return info;
} }
EXPORT_SYMBOL_NS_GPL(sdca_irq_allocate, "SND_SOC_SDCA_IRQ"); EXPORT_SYMBOL_NS_GPL(sdca_irq_allocate, "SND_SOC_SDCA");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SDCA IRQ library"); MODULE_DESCRIPTION("SDCA IRQ library");