From: Uwe Hermann <redacted>
Date: Fri, 31 May 2013 13:18:22 +0000 (+0200)
Subject: nexus-osciprime: Use std_dev_clear().
X-Git-Tag: libsigrok-0.2.1~81
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=658636f1c934b5b865efd0b4a8202603c577dd0b;p=libsigrok.git

nexus-osciprime: Use std_dev_clear().
---

diff --git a/hardware/nexus-osciprime/api.c b/hardware/nexus-osciprime/api.c
index 326dc291..3aafb066 100644
--- a/hardware/nexus-osciprime/api.c
+++ b/hardware/nexus-osciprime/api.c
@@ -102,37 +102,12 @@ static const uint64_t vdivs[][2] = {
 	{ 10, 1 },
 };
 
-
 SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info;
 static struct sr_dev_driver *di = &nexus_osciprime_driver_info;
-static int dev_close(struct sr_dev_inst *sdi);
 
-/* Properly close and free all devices. */
 static int clear_instances(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(devc->usb);
-		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)
@@ -234,11 +209,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
-	clear_instances();
-
-	/* TODO */
-
-	return SR_OK;
+	return clear_instances();
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)