From 06c39a8a79d5fa031d0767474f20509683bdd046 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Thu, 20 Jan 2022 16:01:14 +0900 Subject: [PATCH] util: devices: Rename to init_devices and exit_devices Change-Id: Id3dd8898849d0be990a36c305d1c5e1d3a80b7fa Signed-off-by: Chanwoo Choi --- include/pass/devices.h | 5 ++--- src/main.c | 4 ++-- src/util/devices.c | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/pass/devices.h b/include/pass/devices.h index dd0bd27..1a896ea 100644 --- a/include/pass/devices.h +++ b/include/pass/devices.h @@ -51,9 +51,6 @@ enum device_ops_status { DEVICE_OPS_STATUS_MAX, }; -void devices_init(void *data); -void devices_exit(void *data); - #define DEVICE_OPS_REGISTER(dev) \ static void __CONSTRUCTOR__ module_init(void) \ { \ @@ -64,6 +61,8 @@ static void __DESTRUCTOR__ module_exit(void) \ remove_device(dev); \ } +void init_devices(void *data); +void exit_devices(void *data); void add_device(const struct device_ops *dev); void remove_device(const struct device_ops *dev); #endif diff --git a/src/main.c b/src/main.c index d93a23c..41e7f09 100644 --- a/src/main.c +++ b/src/main.c @@ -64,13 +64,13 @@ int main(int argc, char **argv) g_mainloop = g_main_loop_new(NULL, FALSE); pass_gdbus_get_system_connection(PASS_DBUS_CORE); - devices_init(NULL); + init_devices(NULL); if (late_init() < 0) _E("cannot init pass core system\n"); g_main_loop_run(g_mainloop); + exit_devices(NULL); - devices_exit(NULL); pass_gdbus_put_system_connection(PASS_DBUS_CORE); g_main_loop_unref(g_mainloop); diff --git a/src/util/devices.c b/src/util/devices.c index 296c047..6ea3025 100644 --- a/src/util/devices.c +++ b/src/util/devices.c @@ -38,7 +38,7 @@ void remove_device(const struct device_ops *dev) dev_head = g_list_remove(dev_head, (gconstpointer)dev); } -void devices_init(void *data) +void init_devices(void *data) { GList *elem, *elem_n; const struct device_ops *dev; @@ -59,7 +59,7 @@ void devices_init(void *data) } } -void devices_exit(void *data) +void exit_devices(void *data) { GList *elem; const struct device_ops *dev; -- 2.7.4