Remove non-error hw_info_get() messages.

Currently hw_info_get() can receive requests for entries (info_id) that
the specific driver doesn't support. That is (right now) a valid
use-case and not an error (might change later, though).

Thus, for now, don't output messages for such requests at all (certainly
not as sr_err() where they show up in e.g. sigrok-cli output per default).

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index 31c2fe110784dfc616a7620d3351206b920e2cae..167d4cc83cdb44d89cd547eb7ea7ae6a01f11897 100644 (file)
--- a/hardware/agilent-dmm/api.c
+++ b/hardware/agilent-dmm/api.c
@@ -250,7 +250,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) {

diff --git a/hardware/alsa/api.c b/hardware/alsa/api.c
index 4591fee4093c05e14744184a0c21cc743b9f9af7..5731346132d1b59a18b90c33463b381325f56607 100644 (file)
--- a/hardware/alsa/api.c
+++ b/hardware/alsa/api.c
@@ -163,7 +163,6 @@ static int hw_info_get(int info_id, const void **data,
                *data = &devc->supp_rates;
                break;
        default:
-               sr_err("Invalid info_id: %d.", info_id);
                return SR_ERR_ARG;
        }
 

diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c
index 627793852dcaea1e5b95f286628a11a5cb7fdfc5..3135a5f35f95b9b5fbe9cba0619de086d344adfe 100644 (file)
--- a/hardware/colead-slm/api.c
+++ b/hardware/colead-slm/api.c
@@ -194,7 +194,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) {

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index 93869a4813d3a07fb7a85d8822f86d251111c05d..a7272ad960e8adf8c878483a9637e7ba18632662 100644 (file)
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -284,7 +284,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) {

diff --git a/hardware/lascar-el-usb/api.c b/hardware/lascar-el-usb/api.c
index 210480cc727fc95a2dc5ea31f9c97bec3373bc57..e987570579838a318ad3b3b507e7a7147c6bdd1a 100644 (file)
--- a/hardware/lascar-el-usb/api.c
+++ b/hardware/lascar-el-usb/api.c
@@ -216,7 +216,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) {
@@ -227,7 +226,6 @@ static int hw_info_get(int info_id, const void **data,
                *data = hwcaps;
                break;
        default:
-               sr_err("Unknown info_id: %d.", info_id);
                return SR_ERR_ARG;
        }
 

diff --git a/hardware/nexus-osciprime/api.c b/hardware/nexus-osciprime/api.c
index 8624b841b987a32baf87e2f229658970b23315bd..bb631be27a512d983e6b61a45d2ed343e0a802e1 100644 (file)
--- a/hardware/nexus-osciprime/api.c
+++ b/hardware/nexus-osciprime/api.c
@@ -268,14 +268,12 @@ static int hw_cleanup(void)
 static int hw_info_get(int info_id, const void **data,
                       const struct sr_dev_inst *sdi)
 {
-
        /* TODO */
        (void)data;
        (void)sdi;
 
        switch (info_id) {
        default:
-               sr_err("Unknown info_id: %d.", info_id);
                return SR_ERR_ARG;
        }
 

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 1590f060b6db5c359c837f9233a9839a9784315c..64f8c2220d42c7394bed2ed1fc6f7dd507095a63 100644 (file)
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -347,7 +347,6 @@ static int hw_info_get(int info_id, const void **data,
                *data = coupling;
                break;
        default:
-               sr_err("Unknown info_id: %d.", info_id);
                return SR_ERR_ARG;
        }
 

diff --git a/hardware/tondaj-sl-814/api.c b/hardware/tondaj-sl-814/api.c
index 28e9bc853e5ca947a2dc91205bde661ccaef820f..5b7ed363bc3b4b195cf20ae11a113d02de969796 100644 (file)
--- a/hardware/tondaj-sl-814/api.c
+++ b/hardware/tondaj-sl-814/api.c
@@ -208,7 +208,6 @@ static int hw_info_get(int info_id, const void **data,
                *data = hwcaps;
                break;
        default:
-               sr_err("Unknown info_id: %d.", info_id);
                return SR_ERR_ARG;
        }
 

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index e0d366618dcf3fe0797f7e55fb2c016413e3f48c..d618ef44917af560259695e74a718700e57a7277 100644 (file)
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -186,7 +186,6 @@ static int hw_info_get(int info_id, const void **data,
                return SR_ERR_ARG;
                break;
        default:
-               sr_err("%s: Unknown info_id %d.", __func__, info_id);
                return SR_ERR_ARG;
                break;
        }

diff --git a/hardware/victor-dmm/api.c b/hardware/victor-dmm/api.c
index 496b51b758bba1c51664ce9afc46da04b92c7855..23c12e9dfe40c37edcdc04b3b26791bcca6e7d53 100644 (file)
--- a/hardware/victor-dmm/api.c
+++ b/hardware/victor-dmm/api.c
@@ -254,7 +254,6 @@ static int hw_info_get(int info_id, const void **data,
                *data = hwcaps;
                break;
        default:
-               sr_err("Unknown info_id: %d.", info_id);
                return SR_ERR_ARG;
        }