All drivers: Drop unneeded comments.

diff --git a/device.c b/device.c
index 740ad5077cebcf350e99757e575dc0901c030a13..0050e97e2561d7b33ea1dc0d339d53ec47c1a93b 100644 (file)
--- a/device.c
+++ b/device.c
@@ -268,7 +268,6 @@ SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
 /** @private */
 SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb)
 {
-       /* Avoid compiler warnings. */
        (void)usb;
 
        /* Nothing to do for this device instance type. */

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index c0f4ccaa35f2b24f94fa7a220ec0a2082a7a8592..2dca5c33be68d4aa21830f72ef0e8e007a99539f 100644 (file)
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -71,7 +71,6 @@ static int hw_init(const char *devinfo)
        struct sr_dev_inst *sdi;
        struct context *ctx;
 
-       /* Avoid compiler warnings. */
        (void)devinfo;
 
        if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
@@ -389,7 +388,6 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
 static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
 {
-       /* Avoid compiler warnings. */
        (void)dev_index;
        (void)cb_data;
 

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index c637d4695e758c94208f8b0419ef6a95dfc584e9..c014e3a1647e7f743990bb0db289bf2311b5a74a 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -458,6 +458,7 @@ static GSList *hw_scan(GSList *options)
        int ret, i;
 
        (void)options;
+
        drvc = adi->priv;
        devices = NULL;
        clear_instances();
@@ -1419,7 +1420,6 @@ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
        struct dev_context *devc;
        uint8_t modestatus;
 
-       /* Avoid compiler warnings. */
        (void)cb_data;
 
        sr_source_remove(0);

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 7cde33082f17670e7bf51077749f9826b581e03b..8a8b2cf40b5044de93b6197676b605245c88223d 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -170,6 +170,7 @@ static GSList *hw_scan(GSList *options)
        int i;
 
        (void)options;
+
        drvc = ddi->priv;
        devices = NULL;
 
@@ -204,7 +205,6 @@ static GSList *hw_dev_list(void)
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
 {
-       /* Avoid compiler warnings. */
        (void)sdi;
 
        /* Nothing needed so far. */
@@ -214,7 +214,6 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 
 static int hw_dev_close(struct sr_dev_inst *sdi)
 {
-       /* Avoid compiler warnings. */
        (void)sdi;
 
        /* Nothing needed so far. */
@@ -231,7 +230,6 @@ static int hw_cleanup(void)
 static int hw_info_get(int info_id, const void **data,
        const struct sr_dev_inst *sdi)
 {
-
        (void)sdi;
 
        switch (info_id) {
@@ -404,7 +402,6 @@ static int receive_data(int fd, int revents, void *cb_data)
        unsigned char c[BUFSIZE];
        gsize z;
 
-       /* Avoid compiler warnings. */
        (void)fd;
        (void)revents;
 
@@ -522,7 +519,6 @@ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
        struct dev_context *devc;
 
-       /* Avoid compiler warnings. */
        (void)cb_data;
 
        devc = sdi->priv;

diff --git a/hardware/fluke-dmm/fluke.c b/hardware/fluke-dmm/fluke.c
index dadcc495a06562f51f0843689665079b1b57ca5b..33f7bb651e5c1e7668cd65fe4b11361efb75c00a 100644 (file)
--- a/hardware/fluke-dmm/fluke.c
+++ b/hardware/fluke-dmm/fluke.c
@@ -36,6 +36,7 @@ static struct sr_datafeed_analog *handle_qm_v1(const struct sr_dev_inst *sdi,
        gboolean is_oor;
 
        (void)sdi;
+
        if (strcmp(tokens[0], "QM"))
                return NULL;
 
@@ -158,6 +159,7 @@ static struct sr_datafeed_analog *handle_qm_v2(const struct sr_dev_inst *sdi,
        char *eptr;
 
        (void)sdi;
+
        fvalue = strtof(tokens[0], &eptr);
        if (fvalue == 0.0 && eptr == tokens[0]) {
                sr_err("Invalid float.");

diff --git a/hardware/fx2lafw/command.c b/hardware/fx2lafw/command.c
index 5a085bb6a799ab22a6502436556647c565876878..a1c2109c120d08d83ab568e97f598611f2a52cbc 100644 (file)
--- a/hardware/fx2lafw/command.c
+++ b/hardware/fx2lafw/command.c
@@ -18,7 +18,6 @@
  */
 
 #include <libusb.h>
-
 #include "fx2lafw.h"
 #include "command.h"
 #include "libsigrok.h"

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 89eb01ee85dc10443b5d5a8020ccddace0993c12..b3df9731fbc6e294c608285578c67878b39df95f 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -431,8 +431,8 @@ static GSList *hw_scan(GSList *options)
        libusb_device **devlist;
        int devcnt, num_logic_probes, ret, i, j;
 
-       /* Avoid compiler warnings. */
        (void)options;
+
        drvc = fdi->priv;
 
        /* This scan always invalidates any previous scans. */
@@ -686,7 +686,6 @@ static int receive_data(int fd, int revents, void *cb_data)
 {
        struct timeval tv;
 
-       /* Avoid compiler warnings. */
        (void)fd;
        (void)revents;
        (void)cb_data;
@@ -1028,8 +1027,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
 static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-
-       /* Avoid compiler warnings. */
        (void)cb_data;
 
        abort_acquisition(sdi->priv);

diff --git a/hardware/genericdmm/api.c b/hardware/genericdmm/api.c
index 67b23620b11b721e6162a8bb819e46e214625208..9a86ff019573786d2c0315a5caf7113699b0db42 100644 (file)
--- a/hardware/genericdmm/api.c
+++ b/hardware/genericdmm/api.c
@@ -559,7 +559,6 @@ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
        struct sr_datafeed_packet packet;
 
-       /* Avoid compiler warnings. */
        (void)sdi;
 
        sr_dbg("Stopping acquisition.");

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index 3da352f8463431bbd5f0baf5aa95d463a5f652cb..d1e2fb003cf55ae2c099efb8dfb14fd7f55b88e8 100644 (file)
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -403,7 +403,6 @@ static int mso_parse_serial(const char *iSerial, const char *iProduct,
 
 static int hw_init(void)
 {
-
        /* Nothing to do. */
 
        return SR_OK;
@@ -694,7 +693,6 @@ static int receive_data(int fd, int revents, void *cb_data)
        double analog_out[1024];
        size_t i, s;
 
-       /* Avoid compiler warnings. */
        (void)revents;
 
        s = serial_read(fd, in, sizeof(in));
@@ -830,7 +828,6 @@ static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
 {
        struct sr_datafeed_packet packet;
 
-       /* Avoid compiler warnings. */
        (void)dev_index;
 
        packet.type = SR_DF_END;

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 3145d767063c035dbd59d78cdafa5a1e4e26463c..cb83d11dd5194c42ac7277fe7927c4553f06958c 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -334,6 +334,7 @@ static GSList *hw_scan(GSList *options)
        int ret, devcnt, i, j;
 
        (void)options;
+
        drvc = zdi->priv;
        devices = NULL;
 

diff --git a/input/binary.c b/input/binary.c
index 8348ea82dd9870a6aa223c6fcc804dc5fe4ad0c2..2c7475114dcf0f331f683c50c2bf905a944a0ca7 100644 (file)
--- a/input/binary.c
+++ b/input/binary.c
@@ -35,7 +35,6 @@ struct context {
 
 static int format_match(const char *filename)
 {
-       /* suppress compiler warning */
        (void)filename;
 
        /* this module will handle anything you throw at it */

diff --git a/output/analog.c b/output/analog.c
index 7090d0feb42f49fd7134e17f47fcfeab9e5da3b0..5952613c4b138602351cb3939f0516cb9e433bc5 100644 (file)
--- a/output/analog.c
+++ b/output/analog.c
@@ -186,6 +186,7 @@ static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi,
        int i, j;
 
        (void)sdi;
+
        if (!o || !o->sdi)
                return NULL;
        ctx = o->internal;

diff --git a/output/binary.c b/output/binary.c
index ef41dab4ef76c5c27e6185467c45282d8219a6b6..003b6ce077f7eb87a17d67a70adc9fb3e4e76090 100644 (file)
--- a/output/binary.c
+++ b/output/binary.c
@@ -29,7 +29,6 @@ static int data(struct sr_output *o, const uint8_t *data_in,
 {
        uint8_t *outbuf;
 
-       /* Prevent compiler warnings. */
        (void)o;
 
        if (!data_in) {

diff --git a/session_driver.c b/session_driver.c
index e73411d521fa0fe74118e4c5df7753367410eec7..777a81a5e8068b73ea20256cfc1720e9e0ffea61 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -59,7 +59,6 @@ static int receive_data(int fd, int revents, void *cb_data)
        void *buf;
        int ret, got_data;
 
-       /* Avoid compiler warnings. */
        (void)fd;
        (void)revents;