drivers: Trim unused config_get() calls

None of the driver config_get/set/list calls are required.

diff --git a/backend.c b/backend.c
index 4d39502d399eb5386aa34f6b498d7c99de2722a9..0dab1eeab93f42d938a1b5c0c9df94e9e7636d28 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -173,14 +173,6 @@ static int sanity_check_all_drivers(void)
                        sr_err("No dev_close in driver %d ('%s').", i, d);
                        errors++;
                }
-               if (!drivers[i]->config_get) {
-                       sr_err("No config_get in driver %d ('%s').", i, d);
-                       errors++;
-               }
-               if (!drivers[i]->config_set) {
-                       sr_err("No config_set in driver %d ('%s').", i, d);
-                       errors++;
-               }
                if (!drivers[i]->dev_acquisition_start) {
                        sr_err("No dev_acquisition_start in driver %d ('%s').",
                               i, d);

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index 227cbfcf3e9251dbd066521658c13c23e8ba6b5f..8c792a35c5d10bdd903d18cbe317466908aa92f5 100644 (file)
--- a/hardware/agilent-dmm/api.c
+++ b/hardware/agilent-dmm/api.c
@@ -247,18 +247,6 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-       (void)sdi;
-
-       switch (id) {
-       default:
-               return SR_ERR_ARG;
-       }
-
-       return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -381,7 +369,6 @@ SR_PRIV struct sr_dev_driver agdmm_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,

diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c
index 819e1397873a8d481b4c2866c4d24eb4b6b22447..048fdd918e84587d8be369e4a27fcc4f0c4c7bc3 100644 (file)
--- a/hardware/colead-slm/api.c
+++ b/hardware/colead-slm/api.c
@@ -191,18 +191,6 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-       (void)sdi;
-
-       switch (id) {
-       default:
-               return SR_ERR_ARG;
-       }
-
-       return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -325,7 +313,6 @@ SR_PRIV struct sr_dev_driver colead_slm_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index 8980f25e468b66f9ce68b23ec9ce5b997e217e4b..331b4afdabe6eb2dbfc2916be9cf98bec1f3260a 100644 (file)
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -281,18 +281,6 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-       (void)sdi;
-
-       switch (id) {
-       default:
-               return SR_ERR_ARG;
-       }
-
-       return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -421,7 +409,6 @@ SR_PRIV struct sr_dev_driver flukedmm_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 65e7000c0245225b8b3938537bba0a112457f837..7c2eaa954f00471e223dfac021be341f22468d90 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -422,24 +422,6 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-       uint64_t tmp;
-
-       (void)sdi;
-
-       switch (id) {
-       /* TODO remove this */
-       case SR_CONF_SAMPLERATE:
-               *data = &tmp;
-               break;
-       default:
-               return SR_ERR_ARG;
-       }
-
-       return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -925,7 +907,6 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,

diff --git a/hardware/lascar-el-usb/api.c b/hardware/lascar-el-usb/api.c
index 8ebb4ca0d4a3a6ba75aa420e2f31902ce0142e62..762853885032683a267bb57d89f3fff694b0abe3 100644 (file)
--- a/hardware/lascar-el-usb/api.c
+++ b/hardware/lascar-el-usb/api.c
@@ -213,18 +213,6 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-       (void)sdi;
-
-       switch (id) {
-       default:
-               return SR_ERR_ARG;
-       }
-
-       return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -491,7 +479,6 @@ SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,

diff --git a/hardware/nexus-osciprime/api.c b/hardware/nexus-osciprime/api.c
index d0b610782f6b4cb2b42ddf49753b0dd02b9b3797..c35e2cfb9b84c7c6b99a44daa24572d9207ff87e 100644 (file)
--- a/hardware/nexus-osciprime/api.c
+++ b/hardware/nexus-osciprime/api.c
@@ -265,20 +265,6 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-       /* TODO */
-       (void)data;
-       (void)sdi;
-
-       switch (id) {
-       default:
-               return SR_ERR_ARG;
-       }
-
-       return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        int ret;
@@ -348,7 +334,6 @@ SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 3e3aa54207e754656921878c57363392d0289f3e..5d2e36b6b864714a1ea0140f30a0eef04b2bbac2 100644 (file)
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -324,18 +324,6 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-       (void)sdi;
-
-       switch (id) {
-       default:
-               return SR_ERR_ARG;
-       }
-
-       return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -520,7 +508,6 @@ SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index 69dd3a3e202161a5a089754e36f2a8d18f830f41..b3b0a8efa2963794f0f29c25d2ce8d53801201db 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -373,18 +373,6 @@ static int hw_cleanup(int dmm)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-       (void)sdi;
-
-       switch (id) {
-       default:
-               return SR_ERR_ARG;
-       }
-
-       return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -533,7 +521,6 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
        .scan = hw_scan_##ID_UPPER, \
        .dev_list = hw_dev_list_##ID_UPPER, \
        .dev_clear = clear_instances_##ID_UPPER, \
-       .config_get = config_get, \
        .config_set = config_set, \
        .config_list = config_list, \
        .dev_open = hw_dev_open, \

diff --git a/hardware/tondaj-sl-814/api.c b/hardware/tondaj-sl-814/api.c
index 47c2e67fecb8e8ebb4fffe1d06736685b81157de..9edc441bdbd809aa1ea1a375652563630745a100 100644 (file)
--- a/hardware/tondaj-sl-814/api.c
+++ b/hardware/tondaj-sl-814/api.c
@@ -195,18 +195,6 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-       (void)sdi;
-
-       switch (id) {
-       default:
-               return SR_ERR_ARG;
-       }
-
-       return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -318,7 +306,6 @@ SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index 7ac433339e6276fb00afecb5966f983f74b252b2..26b3e16e7a8fe6327cd8dd2f43f62fb32747de66 100644 (file)
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -186,27 +186,6 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-       (void)sdi;
-
-       sr_spew("Backend requested info_id %d.", id);
-
-       switch (id) {
-       case SR_CONF_SAMPLERATE:
-               /* TODO: Get rid of this. */
-               *data = NULL;
-               sr_spew("%s: Returning current samplerate.", __func__);
-               return SR_ERR_ARG;
-               break;
-       default:
-               return SR_ERR_ARG;
-               break;
-       }
-
-       return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -321,7 +300,6 @@ SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,
@@ -340,7 +318,6 @@ SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,

diff --git a/hardware/victor-dmm/api.c b/hardware/victor-dmm/api.c
index 1e8cd4ae1c0659748ca0769fed26403ce58004a3..53178b2a35ace216ce3cdbeab350321a1bd86f23 100644 (file)
--- a/hardware/victor-dmm/api.c
+++ b/hardware/victor-dmm/api.c
@@ -244,18 +244,6 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-       (void)sdi;
-
-       switch (id) {
-       default:
-               return SR_ERR_ARG;
-       }
-
-       return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -477,7 +465,6 @@ SR_PRIV struct sr_dev_driver victor_dmm_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,