sr: remove unused argument from hardware driver function init()

[libsigrok.git] / hwdriver.c

diff --git a/hwdriver.c b/hwdriver.c
index 185fa8c01d1e005ef35adaca3ac482b4b8f9fa53..7a9e7e668f7a1c0086818cd56e1ff262f7df6ec0 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -23,8 +23,8 @@
 #include <dirent.h>
 #include <string.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 /*
  * This enumerates which driver capabilities correspond to user-settable
@@ -78,9 +78,6 @@ extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
 #ifdef HAVE_HW_HANTEK_DSO
 extern SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
 #endif
-#ifdef HAVE_HW_MASTECH_VA18B
-extern SR_PRIV struct sr_dev_driver mastech_va18b_driver_info;
-#endif
 #ifdef HAVE_HW_GENERICDMM
 extern SR_PRIV struct sr_dev_driver genericdmm_driver_info;
 #endif
@@ -113,9 +110,6 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_HANTEK_DSO
        &hantek_dso_driver_info,
 #endif
-#ifdef HAVE_HW_MASTECH_VA18B
-       &mastech_va18b_driver_info,
-#endif
 #ifdef HAVE_HW_GENERICDMM
        &genericdmm_driver_info,
 #endif
@@ -150,7 +144,7 @@ SR_API int sr_driver_init(struct sr_dev_driver *driver)
        char **probe_names;
 
        sr_dbg("initializing %s driver", driver->name);
-       num_devs = driver->init(NULL);
+       num_devs = driver->init();
        for (i = 0; i < num_devs; i++) {
                num_probes = GPOINTER_TO_INT(
                                driver->dev_info_get(i, SR_DI_NUM_PROBES));