diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2024-02-21 10:52:57 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2024-02-21 16:50:48 -0600 |
| commit | fa849c0c1ab3677daefd7926125af5363472e82f (patch) | |
| tree | bb2988083971278637bf5142da76c864bb6ea6e4 | |
| parent | a3754ea275282b48e1520b248e624b0c7e13c1b2 (diff) | |
| download | ofono-fa849c0c1ab3677daefd7926125af5363472e82f.tar.gz | |
qmi: Rename qmi_device_unref to qmi_device_free
Since reference counting wasn't used, rename qmi_device_unref to
qmi_device_free.
| -rw-r--r-- | drivers/qmimodem/qmi.c | 8 | ||||
| -rw-r--r-- | drivers/qmimodem/qmi.h | 2 | ||||
| -rw-r--r-- | plugins/gobi.c | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/drivers/qmimodem/qmi.c b/drivers/qmimodem/qmi.c index 2dde31b11..8587766ef 100644 --- a/drivers/qmimodem/qmi.c +++ b/drivers/qmimodem/qmi.c @@ -63,7 +63,6 @@ struct qmi_device_ops { }; struct qmi_device { - int ref_count; int fd; GIOChannel *io; guint read_watch; @@ -920,8 +919,6 @@ static int qmi_device_init(struct qmi_device *device, int fd, __debug_device(device, "device %p new", device); - device->ref_count = 1; - device->fd = fd; flags = fcntl(device->fd, F_GETFL, NULL); @@ -967,14 +964,11 @@ static void __qmi_device_shutdown_finished(struct qmi_device *device) device->ops->destroy(device); } -void qmi_device_unref(struct qmi_device *device) +void qmi_device_free(struct qmi_device *device) { if (!device) return; - if (__sync_sub_and_fetch(&device->ref_count, 1)) - return; - __debug_device(device, "device %p free", device); l_queue_destroy(device->control_queue, __request_free); diff --git a/drivers/qmimodem/qmi.h b/drivers/qmimodem/qmi.h index 14ad84e50..ef2140faa 100644 --- a/drivers/qmimodem/qmi.h +++ b/drivers/qmimodem/qmi.h @@ -81,7 +81,7 @@ typedef void (*qmi_debug_func_t)(const char *str, void *user_data); typedef void (*qmi_shutdown_func_t)(void *user_data); typedef void (*qmi_discover_func_t)(void *user_data); -void qmi_device_unref(struct qmi_device *device); +void qmi_device_free(struct qmi_device *device); void qmi_device_set_debug(struct qmi_device *device, qmi_debug_func_t func, void *user_data); diff --git a/plugins/gobi.c b/plugins/gobi.c index 4134c62d3..2b29afbef 100644 --- a/plugins/gobi.c +++ b/plugins/gobi.c @@ -147,7 +147,7 @@ static void gobi_remove(struct ofono_modem *modem) cleanup_services(data); - qmi_device_unref(data->device); + qmi_device_free(data->device); g_free(data); } @@ -161,7 +161,7 @@ static void shutdown_cb(void *user_data) data->discover_attempts = 0; - qmi_device_unref(data->device); + qmi_device_free(data->device); data->device = NULL; ofono_modem_set_powered(modem, FALSE); |