Driver struct cleanups.

[libsigrok.git] / hwdriver.c

diff --git a/hwdriver.c b/hwdriver.c
index c2d7a6fe1938a7d2c85b4f85d1996746c2e49b58..5bfd49fbc70e6453f2cca03a4b605f874e7e5d6b 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -84,7 +84,7 @@ static struct sr_config_info sr_config_info_data[] = {
 
 /** @cond PRIVATE */
 #ifdef HAVE_HW_BRYMEN_DMM
-extern SR_PRIV struct sr_dev_driver brymen_dmm_driver_info;
+extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
 #endif
 #ifdef HAVE_HW_COLEAD_SLM
 extern SR_PRIV struct sr_dev_driver colead_slm_driver_info;
@@ -164,7 +164,7 @@ extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
 
 static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_BRYMEN_DMM
-       &brymen_dmm_driver_info,
+       &brymen_bm857_driver_info,
 #endif
 #ifdef HAVE_HW_COLEAD_SLM
        &colead_slm_driver_info,
@@ -383,9 +383,6 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key,
        if (!driver || !data)
                return SR_ERR;
 
-       if (!driver->config_get)
-               return SR_ERR_ARG;
-
        ret = driver->config_get(key, data, sdi);
 
        return ret;
@@ -443,9 +440,6 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver, int key,
        if (!driver || !data)
                return SR_ERR;
 
-       if (!driver->config_list)
-               return SR_ERR_ARG;
-
        ret = driver->config_list(key, data, sdi);
 
        return ret;