From 0237665beff4fa5e45b1d1ac5857627f949721b5 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 21 Feb 2023 13:19:26 +0000 Subject: libkmod: remove unused kmod_module_get_builtin The last and only user was removed with commit 0246e06 ("depmod: Stop opening modules.modinfo once per module") Signed-off-by: Emil Velikov Signed-off-by: Lucas De Marchi --- libkmod/libkmod-internal.h | 1 - libkmod/libkmod-module.c | 43 ------------------------------------------- 2 files changed, 44 deletions(-) diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h index c22644a..95c0377 100644 --- a/libkmod/libkmod-internal.h +++ b/libkmod/libkmod-internal.h @@ -148,7 +148,6 @@ void kmod_module_set_visited(struct kmod_module *mod, bool visited) __attribute_ void kmod_module_set_builtin(struct kmod_module *mod, bool builtin) __attribute__((nonnull((1)))); void kmod_module_set_required(struct kmod_module *mod, bool required) __attribute__((nonnull(1))); bool kmod_module_is_builtin(struct kmod_module *mod) __attribute__((nonnull(1))); -int kmod_module_get_builtin(struct kmod_ctx *ctx, struct kmod_list **list) __attribute__((nonnull(1, 2))); /* libkmod-file.c */ struct kmod_file *kmod_file_open(const struct kmod_ctx *ctx, const char *filename) _must_check_ __attribute__((nonnull(1,2))); diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c index c7232e0..1da64b3 100644 --- a/libkmod/libkmod-module.c +++ b/libkmod/libkmod-module.c @@ -2943,46 +2943,3 @@ KMOD_EXPORT void kmod_module_dependency_symbols_free_list(struct kmod_list *list list = kmod_list_remove(list); } } - -/** - * kmod_module_get_builtin: - * @ctx: kmod library context - * @list: where to save the builtin module list - * - * Returns: 0 on success or < 0 otherwise. - */ -int kmod_module_get_builtin(struct kmod_ctx *ctx, struct kmod_list **list) -{ - struct kmod_builtin_iter *iter; - int err = 0; - - iter = kmod_builtin_iter_new(ctx); - if (!iter) - return -errno; - - while (kmod_builtin_iter_next(iter)) { - struct kmod_module *mod = NULL; - char modname[PATH_MAX]; - - if (!kmod_builtin_iter_get_modname(iter, modname)) { - err = -errno; - goto fail; - } - - err = kmod_module_new_from_name(ctx, modname, &mod); - if (err < 0) - goto fail; - - kmod_module_set_builtin(mod, true); - - *list = kmod_list_append(*list, mod); - } - - kmod_builtin_iter_free(iter); - return err; -fail: - kmod_builtin_iter_free(iter); - kmod_module_unref_list(*list); - *list = NULL; - return err; -} -- cgit v1.2.1