Skip to content

Commit f33ab73

Browse files
committed
lib-manager: llext: remove entry point functions
The current library loading API prescribes that all modules should have entry functions whose only role in fact (in case of LLEXT at least) is returning an interface operations popinter. LLEXT modules don't need that, they can store that pointer directly in module manifest. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent 20c4ec5 commit f33ab73

File tree

28 files changed

+49
-118
lines changed

28 files changed

+49
-118
lines changed

src/audio/aria/aria.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,8 @@ static const struct module_interface aria_interface = {
320320
#include <module/module/llext.h>
321321
#include <rimage/sof/user/manifest.h>
322322

323-
SOF_LLEXT_MOD_ENTRY(aria, &aria_interface);
324-
325323
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
326-
SOF_LLEXT_MODULE_MANIFEST("ARIA", aria_llext_entry, 1, SOF_REG_UUID(aria), 8);
324+
SOF_LLEXT_MODULE_MANIFEST("ARIA", &aria_interface, 1, SOF_REG_UUID(aria), 8);
327325

328326
SOF_LLEXT_BUILDINFO;
329327

src/audio/asrc/asrc.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -892,10 +892,8 @@ static const struct module_interface asrc_interface = {
892892
#include <module/module/llext.h>
893893
#include <rimage/sof/user/manifest.h>
894894

895-
SOF_LLEXT_MOD_ENTRY(asrc, &asrc_interface);
896-
897895
static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
898-
SOF_LLEXT_MODULE_MANIFEST("ASRC", asrc_llext_entry, 1, SOF_REG_UUID(asrc4), 2),
896+
SOF_LLEXT_MODULE_MANIFEST("ASRC", &asrc_interface, 1, SOF_REG_UUID(asrc4), 2),
899897
};
900898

901899
SOF_LLEXT_BUILDINFO;

src/audio/codec/dts/dts.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,10 +473,8 @@ static const struct module_interface dts_interface = {
473473
#include <module/module/llext.h>
474474
#include <rimage/sof/user/manifest.h>
475475

476-
SOF_LLEXT_MOD_ENTRY(dts, &dts_interface);
477-
478476
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
479-
SOF_LLEXT_MODULE_MANIFEST("DTS", dts_llext_entry, 1, SOF_REG_UUID(dts), 40);
477+
SOF_LLEXT_MODULE_MANIFEST("DTS", &dts_interface, 1, SOF_REG_UUID(dts), 40);
480478

481479
SOF_LLEXT_BUILDINFO;
482480

src/audio/crossover/crossover.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -642,10 +642,8 @@ static const struct module_interface crossover_interface = {
642642
#include <module/module/llext.h>
643643
#include <rimage/sof/user/manifest.h>
644644

645-
SOF_LLEXT_MOD_ENTRY(crossover, &crossover_interface);
646-
647645
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
648-
SOF_LLEXT_MODULE_MANIFEST("XOVER", crossover_llext_entry, 1, SOF_REG_UUID(crossover), 40);
646+
SOF_LLEXT_MODULE_MANIFEST("XOVER", &crossover_interface, 1, SOF_REG_UUID(crossover), 40);
649647

650648
SOF_LLEXT_BUILDINFO;
651649

src/audio/dcblock/dcblock.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,8 @@ static const struct module_interface dcblock_interface = {
265265
#include <module/module/llext.h>
266266
#include <rimage/sof/user/manifest.h>
267267

268-
SOF_LLEXT_MOD_ENTRY(dcblock, &dcblock_interface);
269-
270268
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
271-
SOF_LLEXT_MODULE_MANIFEST("DCBLOCK", dcblock_llext_entry, 1, SOF_REG_UUID(dcblock), 40);
269+
SOF_LLEXT_MODULE_MANIFEST("DCBLOCK", &dcblock_interface, 1, SOF_REG_UUID(dcblock), 40);
272270

273271
SOF_LLEXT_BUILDINFO;
274272

src/audio/drc/drc.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,10 +424,8 @@ static const struct module_interface drc_interface = {
424424
#include <module/module/api_ver.h>
425425
#include <rimage/sof/user/manifest.h>
426426

427-
SOF_LLEXT_MOD_ENTRY(drc, &drc_interface);
428-
429427
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
430-
SOF_LLEXT_MODULE_MANIFEST("DRC", drc_llext_entry, 1, SOF_REG_UUID(drc), 40);
428+
SOF_LLEXT_MODULE_MANIFEST("DRC", &drc_interface, 1, SOF_REG_UUID(drc), 40);
431429

432430
SOF_LLEXT_BUILDINFO;
433431

src/audio/eq_fir/eq_fir.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -490,10 +490,8 @@ static const struct module_interface eq_fir_interface = {
490490
#include <module/module/llext.h>
491491
#include <rimage/sof/user/manifest.h>
492492

493-
SOF_LLEXT_MOD_ENTRY(eq_fir, &eq_fir_interface);
494-
495493
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
496-
SOF_LLEXT_MODULE_MANIFEST("EQFIR", eq_fir_llext_entry, 1, SOF_REG_UUID(eq_fir), 40);
494+
SOF_LLEXT_MODULE_MANIFEST("EQFIR", &eq_fir_interface, 1, SOF_REG_UUID(eq_fir), 40);
497495

498496
SOF_LLEXT_BUILDINFO;
499497

src/audio/eq_iir/eq_iir.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,8 @@ static const struct module_interface eq_iir_interface = {
260260
#include <module/module/llext.h>
261261
#include <rimage/sof/user/manifest.h>
262262

263-
SOF_LLEXT_MOD_ENTRY(eq_iir, &eq_iir_interface);
264-
265263
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
266-
SOF_LLEXT_MODULE_MANIFEST("EQIIR", eq_iir_llext_entry, 1, SOF_REG_UUID(eq_iir), 40);
264+
SOF_LLEXT_MODULE_MANIFEST("EQIIR", &eq_iir_interface, 1, SOF_REG_UUID(eq_iir), 40);
267265

268266
SOF_LLEXT_BUILDINFO;
269267

src/audio/google/google_ctc_audio_processing.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,8 @@ static const struct module_interface google_ctc_audio_processing_interface = {
466466
#include <module/module/llext.h>
467467
#include <rimage/sof/user/manifest.h>
468468

469-
SOF_LLEXT_MOD_ENTRY(google_ctc_audio_processing, &google_ctc_audio_processing_interface);
470-
471469
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
472-
SOF_LLEXT_MODULE_MANIFEST("CTC", google_ctc_audio_processing_llext_entry,
470+
SOF_LLEXT_MODULE_MANIFEST("CTC", &google_ctc_audio_processing_interface,
473471
1, SOF_REG_UUID(google_ctc_audio_processing), 40);
474472

475473
SOF_LLEXT_BUILDINFO;

src/audio/google/google_rtc_audio_processing.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -856,10 +856,8 @@ static const struct module_interface google_rtc_audio_processing_interface = {
856856
#include <module/module/llext.h>
857857
#include <rimage/sof/user/manifest.h>
858858

859-
SOF_LLEXT_MOD_ENTRY(google_rtc_audio_processing, &google_rtc_audio_processing_interface);
860-
861859
static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
862-
SOF_LLEXT_MODULE_MANIFEST("RTC_AEC", google_rtc_audio_processing_llext_entry,
860+
SOF_LLEXT_MODULE_MANIFEST("RTC_AEC", &google_rtc_audio_processing_interface,
863861
7, SOF_REG_UUID(google_rtc_audio_processing), 1);
864862

865863
SOF_LLEXT_BUILDINFO;

0 commit comments

Comments
 (0)