Introduce standard cleanup helper

[libsigrok.git] / src / hardware / maynuo-m97 / api.c

diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index 090bae3e1fcd91433b92ad8a56250277366675ad..d2212ca650b6701f07e9819893d18fad39e583e3 100644 (file)
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -253,11 +253,6 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-       return dev_clear(di);
-}
-
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
@@ -351,7 +346,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        struct sr_modbus_dev_inst *modbus;
        int ret;
 
-       (void)data;
        (void)cg;
 
        if (sdi->status != SR_ST_ACTIVE)
@@ -453,15 +447,12 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        return ret;
 }
 
-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_modbus_dev_inst *modbus;
        int ret;
 
-       (void)cb_data;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -472,7 +463,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
                        maynuo_m97_receive_data, (void *)sdi)) != SR_OK)
                return ret;
 
-       /* Send header packet to the session bus. */
        std_session_send_df_header(sdi, LOG_PREFIX);
 
        devc->num_samples = 0;
@@ -481,12 +471,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
        return maynuo_m97_capture_start(sdi);
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
        struct sr_modbus_dev_inst *modbus;
 
-       (void)cb_data;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -503,7 +491,7 @@ SR_PRIV struct sr_dev_driver maynuo_m97_driver_info = {
        .longname = "maynuo M97/M98 series",
        .api_version = 1,
        .init = init,
-       .cleanup = cleanup,
+       .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = dev_list,
        .dev_clear = dev_clear,