kingst-la2016: sort include directives

[libsigrok.git] / src / hardware / kingst-la2016 / api.c

diff --git a/src/hardware/kingst-la2016/api.c b/src/hardware/kingst-la2016/api.c
index 8cf7bda65076ad015120d2675381aa165bbac327..03edcf14c5e96929dbc6342807b27cac044d7515 100644 (file)
--- a/src/hardware/kingst-la2016/api.c
+++ b/src/hardware/kingst-la2016/api.c
@@ -23,12 +23,14 @@
 /* mostly stolen from src/hardware/saleae-logic16/ */
 
 #include <config.h>
+
 #include <glib.h>
+#include <libsigrok/libsigrok.h>
 #include <libusb.h>
+#include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-#include <libsigrok/libsigrok.h>
+
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
@@ -540,12 +542,6 @@ static int config_list(uint32_t key, GVariant **data,
        return SR_OK;
 }
 
-static void abort_acquisition(struct dev_context *devc)
-{
-       if (devc->transfer)
-               libusb_cancel_transfer(devc->transfer);
-}
-
 static int configure_channels(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -596,7 +592,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        devc->ctx = drvc->sr_ctx;
 
        if ((ret = la2016_start_acquisition(sdi)) != SR_OK) {
-               abort_acquisition(devc);
+               la2016_abort_acquisition(sdi);
                return ret;
        }
 
@@ -614,7 +610,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        int ret;
 
        ret = la2016_abort_acquisition(sdi);
-       abort_acquisition(sdi->priv);
 
        return ret;
 }