Introduce standard cleanup helper

[libsigrok.git] / src / hardware / serial-dmm / api.c

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index f53381bf93856f3b2d1ae935ec8d8a5deca49f4a..6b32f6485ec60b43bcf90e98db69f2f140e402e8 100644 (file)
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -155,11 +155,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
        return ((struct drv_context *)(di->context))->instances;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-       return dev_clear(di);
-}
-
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
@@ -211,7 +206,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        return SR_OK;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
@@ -220,7 +215,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                return SR_ERR_DEV_CLOSED;
 
        devc = sdi->priv;
-       devc->cb_data = cb_data;
 
        /*
         * Reset the number of samples to take. If we've already collected our
@@ -230,7 +224,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        devc->num_samples = 0;
        devc->starttime = g_get_monotonic_time();
 
-       std_session_send_df_header(cb_data, LOG_PREFIX);
+       std_session_send_df_header(sdi, LOG_PREFIX);
 
        /* Poll every 50ms, or whenever some data comes in. */
        serial = sdi->conn;
@@ -240,9 +234,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
+       return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
                        sdi->conn, LOG_PREFIX);
 }
 
@@ -254,7 +248,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
                        .longname = VENDOR " " MODEL, \
                        .api_version = 1, \
                        .init = init, \
-                       .cleanup = cleanup, \
+                       .cleanup = std_cleanup, \
                        .scan = scan, \
                        .dev_list = dev_list, \
                        .dev_clear = dev_clear, \