Drop some lines that are no longer needed.

diff --git a/hardware/alsa/api.c b/hardware/alsa/api.c
index d55b50e74e70653ca037013dd6356f5e42645f88..fd9a3650ab55e6ce0fb1d3dab04656a9c93a3f35 100644 (file)
--- a/hardware/alsa/api.c
+++ b/hardware/alsa/api.c
@@ -172,8 +172,6 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
        GVariantBuilder gvb;
        int i;
 
-       (void)sdi;
-
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 98c95457ce49259b827e6607bc1f8b9d1c127502..9807edefe47d2501af17d217ad78550ff5520839 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -210,8 +210,6 @@ static GSList *hw_dev_list(void)
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
 {
-       (void)sdi;
-
        sdi->status = SR_ST_ACTIVE;
 
        return SR_OK;
@@ -219,9 +217,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 
 static int hw_dev_close(struct sr_dev_inst *sdi)
 {
-       (void)sdi;
-
-    sdi->status = SR_ST_INACTIVE;
+       sdi->status = SR_ST_INACTIVE;
 
        return SR_OK;
 }

diff --git a/hardware/fluke-dmm/fluke.c b/hardware/fluke-dmm/fluke.c
index 2c6451dcf2785f31a5f62008b525a5cd9f531a5c..848e03e545309d848a0b54094e5730201d8c8af7 100644 (file)
--- a/hardware/fluke-dmm/fluke.c
+++ b/hardware/fluke-dmm/fluke.c
@@ -35,8 +35,6 @@ static struct sr_datafeed_analog *handle_qm_18x(const struct sr_dev_inst *sdi,
        char *e, *u;
        gboolean is_oor;
 
-       (void)sdi;
-
        if (strcmp(tokens[0], "QM") || !tokens[1])
                return NULL;
 
@@ -159,8 +157,6 @@ static struct sr_datafeed_analog *handle_qm_28x(const struct sr_dev_inst *sdi,
        float fvalue;
        char *eptr;
 
-       (void)sdi;
-
        if (!tokens[1])
                return NULL;
 

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 91396cbf737119ce55e356e1b721a1876d2c1650..738bc4c58b4a3c9e35f681d80922ee29fd40e88d 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -343,7 +343,6 @@ static struct dev_context *fx2lafw_dev_new(void)
        devc->limit_samples = 0;
        devc->sample_wide = 0;
 
-
        return devc;
 }
 

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 940288e49a70390d01a2f907345ed2ffbdc4b672..2fca660ea34dda454129af7985a2617a5b1c48b6 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -593,8 +593,6 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
        GVariantBuilder gvb;
        unsigned int i;
 
-       (void)sdi;
-
        if (!sdi)
                return SR_ERR_ARG;
 

diff --git a/hardware/lascar-el-usb/api.c b/hardware/lascar-el-usb/api.c
index e5160856624726a110c65d66dfc0edf9091befda..3809482c5f52e6eda6451ba195133a105e8fadc9 100644 (file)
--- a/hardware/lascar-el-usb/api.c
+++ b/hardware/lascar-el-usb/api.c
@@ -81,8 +81,6 @@ static GSList *hw_scan(GSList *options)
        GSList *usb_devices, *devices, *l;
        const char *conn;
 
-       (void)options;
-
        drvc = di->priv;
 
        conn = NULL;

diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c
index c9b56631bba96f95207275d7d18477f332181eb5..16dfe355b417c420d11eb4387028b92ab430f0c2 100644 (file)
--- a/hardware/link-mso19/api.c
+++ b/hardware/link-mso19/api.c
@@ -67,8 +67,6 @@ static GSList *hw_scan(GSList *options)
        struct udev *udev;
        int ptype;
 
-       (void)options;
-
        for (l = options; l; l = l->next) {
                src = l->data;
                switch (src->key) {

diff --git a/hardware/nexus-osciprime/api.c b/hardware/nexus-osciprime/api.c
index f28069860c25ad74663e3ac5feb5f14678ca51f2..35bf27423af92cc047ffede3ff6691cc20c56021 100644 (file)
--- a/hardware/nexus-osciprime/api.c
+++ b/hardware/nexus-osciprime/api.c
@@ -153,8 +153,6 @@ static GSList *hw_scan(GSList *options)
        int i;
        const char *conn;
 
-       (void)options;
-
        drvc = di->priv;
 
        conn = NULL;

diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c
index eb7275a34fa2a48b2e1d2f5e20c1e567d1e94e38..31f386568d32e4972a7399cce92d8f8bd0d7d672 100644 (file)
--- a/hardware/openbench-logic-sniffer/api.c
+++ b/hardware/openbench-logic-sniffer/api.c
@@ -72,8 +72,6 @@ static GSList *scan(GSList *options)
        const char *conn, *serialcomm;
        char buf[8];
 
-       (void)options;
-
        drvc = di->priv;
 
        devices = NULL;
@@ -464,7 +462,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-       /* Avoid compiler warnings. */
        (void)cb_data;
 
        abort_acquisition(sdi);

diff --git a/hardware/rigol-ds1xx2/protocol.c b/hardware/rigol-ds1xx2/protocol.c
index c11006b37812f93c26ce784c42d6a82d144de3cf..942aecfd801efce77a3c4ee886c66ae57605a524 100644 (file)
--- a/hardware/rigol-ds1xx2/protocol.c
+++ b/hardware/rigol-ds1xx2/protocol.c
@@ -43,7 +43,7 @@ SR_PRIV int rigol_ds1xx2_receive(int fd, int revents, void *cb_data)
        int len, i, waveform_size;
        struct sr_probe *probe;
 
-       (void) fd;
+       (void)fd;
 
        if (!(sdi = cb_data))
                return TRUE;