s/clear_instances/dev_clear/.

[libsigrok.git] / hardware / lascar-el-usb / api.c

diff --git a/hardware/lascar-el-usb/api.c b/hardware/lascar-el-usb/api.c
index 7553e6cf2c2be4b44ee9fa3b89c277c0625fffca..464eb6b1048cc1a922683e3f44c4dead0327b054 100644 (file)
--- a/hardware/lascar-el-usb/api.c
+++ b/hardware/lascar-el-usb/api.c
@@ -26,7 +26,6 @@
 SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address);
 SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
 static struct sr_dev_driver *di = &lascar_el_usb_driver_info;
-static int dev_close(struct sr_dev_inst *sdi);
 
 static const int32_t hwopts[] = {
        SR_CONF_CONN,
@@ -39,37 +38,14 @@ static const int32_t hwcaps[] = {
        SR_CONF_LIMIT_SAMPLES,
 };
 
-/* Properly close and free all devices. */
-static int clear_instances(void)
+static int dev_clear(void)
 {
-       struct sr_dev_inst *sdi;
-       struct drv_context *drvc;
-       struct dev_context *devc;
-       GSList *l;
-
-       if (!(drvc = di->priv))
-               return SR_OK;
-
-       for (l = drvc->instances; l; l = l->next) {
-               if (!(sdi = l->data))
-                       continue;
-               if (!(devc = sdi->priv))
-                       continue;
-
-               dev_close(sdi);
-               sr_usb_dev_inst_free(sdi->conn);
-               sr_dev_inst_free(sdi);
-       }
-
-       g_slist_free(drvc->instances);
-       drvc->instances = NULL;
-
-       return SR_OK;
+       return std_dev_clear(di, NULL);
 }
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)
@@ -173,17 +149,18 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
+       int ret;
        struct drv_context *drvc;
 
        if (!(drvc = di->priv))
                /* Can get called on an unused driver, doesn't matter. */
                return SR_OK;
 
-       clear_instances();
+       ret = dev_clear();
        g_free(drvc);
        di->priv = NULL;
 
-       return SR_OK;
+       return ret;
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
@@ -507,7 +484,7 @@ SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info = {
        .cleanup = cleanup,
        .scan = scan,
        .dev_list = dev_list,
-       .dev_clear = clear_instances,
+       .dev_clear = dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,