Various drivers: Drop some unneeded lines.

diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c
index 1b56227e2358b848fdfda8f2cdf334c750cbdab1..34853a0cbe9873c469fc536f9de09c29a4f795c3 100644 (file)
--- a/hardware/cem-dt-885x/api.c
+++ b/hardware/cem-dt-885x/api.c
@@ -405,8 +405,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-       (void)cb_data;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 

diff --git a/hardware/gmc-mh-1x-2x/api.c b/hardware/gmc-mh-1x-2x/api.c
index ec12ab2fa06128e83d88494281e3db6e632af74f..09ed9c151bc79a86f278e2195b5dfc92d581c942 100644 (file)
--- a/hardware/gmc-mh-1x-2x/api.c
+++ b/hardware/gmc-mh-1x-2x/api.c
@@ -428,14 +428,10 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
        int ret;
        struct dev_context *devc;
 
-       (void)sdi;
-       (void)data;
        (void)cg;
 
        ret = SR_OK;
 
-       (void)cg;
-
        if (!sdi || !(devc = sdi->priv))
                return SR_ERR_ARG;
 
@@ -447,7 +443,6 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
        case SR_CONF_LIMIT_MSEC:
                *data = g_variant_new_uint64(devc->limit_msec);
                break;
-
        case SR_CONF_POWER_OFF:
                *data = g_variant_new_boolean(FALSE);
                break;
@@ -481,8 +476,6 @@ static int config_list_common(int key, GVariant **data, const struct sr_dev_inst
 static int config_list_sm(int key, GVariant **data, const struct sr_dev_inst *sdi,
                          const struct sr_channel_group *cg)
 {
-       (void)sdi;
-
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
@@ -499,8 +492,6 @@ static int config_list_sm(int key, GVariant **data, const struct sr_dev_inst *sd
 static int config_list_bd(int key, GVariant **data, const struct sr_dev_inst *sdi,
                          const struct sr_channel_group *cg)
 {
-       (void)sdi;
-
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,

diff --git a/hardware/norma-dmm/api.c b/hardware/norma-dmm/api.c
index 13a40512ba120008c323d6b917224ba0fe0c7c6c..6860a783d6ebfeb2db31e42de9bdd77ef8aae0aa 100644 (file)
--- a/hardware/norma-dmm/api.c
+++ b/hardware/norma-dmm/api.c
@@ -250,9 +250,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
 
-       (void)sdi;
-       (void)cb_data;
-
        if (!sdi || !cb_data || !(devc = sdi->priv))
                return SR_ERR_BUG;
 

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index 0ab3152b725d320a2eae73675409e6be08d406c9..ef31de040b0df57d019446b902b919121b906d91 100644 (file)
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -257,8 +257,6 @@ static int dev_open(struct sr_dev_inst *sdi, int dmm)
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-       (void)sdi;
-
        /* TODO */
 
        sdi->status = SR_ST_INACTIVE;

diff --git a/hardware/uni-t-ut32x/protocol.c b/hardware/uni-t-ut32x/protocol.c
index 95323a67f8c77e9a16008c6d59188fc7213a220e..863f9fa82aab7bae3a7e370d1c94eb5aee27d6f0 100644 (file)
--- a/hardware/uni-t-ut32x/protocol.c
+++ b/hardware/uni-t-ut32x/protocol.c
@@ -203,6 +203,7 @@ SR_PRIV int uni_t_ut32x_handle_events(int fd, int revents, void *cb_data)
 
        (void)fd;
        (void)revents;
+
        drvc = di->priv;
 
        if (!(sdi = cb_data))