From 4c71137c38d278ad02633e8a4470be4dd2360768 Mon Sep 17 00:00:00 2001 From: Andrzej Kaczmarek Date: Mon, 3 Sep 2012 13:59:40 +0300 Subject: [PATCH] proximity: Change adapter driver function names The probe and remove suffixes better describe what these functions actually do. --- profiles/proximity/manager.c | 4 ++-- profiles/proximity/reporter.c | 4 ++-- profiles/proximity/reporter.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/profiles/proximity/manager.c b/profiles/proximity/manager.c index 6368221ef..fddb6298b 100644 --- a/profiles/proximity/manager.c +++ b/profiles/proximity/manager.c @@ -93,8 +93,8 @@ static struct btd_profile pxp_profile = { .device_probe = attio_device_probe, .device_remove = attio_device_remove, - .adapter_probe = reporter_init, - .adapter_remove = reporter_exit, + .adapter_probe = reporter_adapter_probe, + .adapter_remove = reporter_adapter_remove, }; static void load_config_file(GKeyFile *config) diff --git a/profiles/proximity/reporter.c b/profiles/proximity/reporter.c index d2eb1946a..59af30896 100644 --- a/profiles/proximity/reporter.c +++ b/profiles/proximity/reporter.c @@ -251,7 +251,7 @@ void reporter_device_remove(struct btd_device *device) unregister_reporter_device(device, radapter); } -int reporter_init(struct btd_adapter *adapter) +int reporter_adapter_probe(struct btd_adapter *adapter) { struct reporter_adapter *radapter; DBusConnection *conn; @@ -279,7 +279,7 @@ int reporter_init(struct btd_adapter *adapter) return 0; } -void reporter_exit(struct btd_adapter *adapter) +void reporter_adapter_remove(struct btd_adapter *adapter) { struct reporter_adapter *radapter = find_reporter_adapter(adapter); if (!radapter) diff --git a/profiles/proximity/reporter.h b/profiles/proximity/reporter.h index 4f3bee241..d038c0e89 100644 --- a/profiles/proximity/reporter.h +++ b/profiles/proximity/reporter.h @@ -39,7 +39,7 @@ enum { void reporter_device_remove(struct btd_device *device); int reporter_device_probe(struct btd_device *device); -int reporter_init(struct btd_adapter *adapter); -void reporter_exit(struct btd_adapter *adapter); +int reporter_adapter_probe(struct btd_adapter *adapter); +void reporter_adapter_remove(struct btd_adapter *adapter); const char *get_alert_level_string(uint8_t level); -- 2.47.3