Introduce standard cleanup helper

[libsigrok.git] / src / hardware / asix-sigma / api.c

diff --git a/src/hardware/asix-sigma/api.c b/src/hardware/asix-sigma/api.c
index 8b798d4ecdb91f9756c78166c8f01faf07b175c1..25b5cad3b22b366445c1fce26fcaea5bf7eb8536 100644 (file)
--- a/src/hardware/asix-sigma/api.c
+++ b/src/hardware/asix-sigma/api.c
@@ -188,11 +188,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)
 {
@@ -301,7 +296,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 clockselect_50 clockselect;
@@ -334,7 +329,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                sigma_set_register(WRITE_TRIGGER_SELECT1, 0x81, devc);
 
                /* Find which pin to trigger on from mask. */
-               for (triggerpin = 0; triggerpin < 8; ++triggerpin)
+               for (triggerpin = 0; triggerpin < 8; triggerpin++)
                        if ((devc->trigger.risingmask | devc->trigger.fallingmask) &
                            (1 << triggerpin))
                                break;
@@ -398,9 +393,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        gettimeofday(&devc->start_tv, 0);
        sigma_set_register(WRITE_MODE, 0x0d, devc);
 
-       devc->cb_data = cb_data;
-
-       /* Send header packet to the session bus. */
        std_session_send_df_header(sdi, LOG_PREFIX);
 
        /* Add capture source. */
@@ -411,12 +403,10 @@ 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)
 {
        struct dev_context *devc;
 
-       (void)cb_data;
-
        devc = sdi->priv;
        devc->state.state = SIGMA_IDLE;
 
@@ -430,7 +420,7 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info = {
        .longname = "ASIX SIGMA/SIGMA2",
        .api_version = 1,
        .init = init,
-       .cleanup = cleanup,
+       .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = dev_list,
        .dev_clear = dev_clear,