X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fapi.c;h=e25c5578f72ba4fa5a89857c763565b99c779626;hb=1f8f5bc08e0f684156baac513431b40d79ab4ea1;hp=5107d309f0d15ec172fa36ec60a0db0ac71199ab;hpb=700d6b64d578ce10e57f6a2289e37a5564eccf1c;p=libsigrok.git

diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index 5107d309..e25c5578 100644
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -55,15 +55,12 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info;
 /* TODO: Use sr_dev_inst to store connection handle & use std_dev_clear(). */
 static int dev_clear(const struct sr_dev_driver *di)
 {
+	struct drv_context *drvc = di->context;
 	GSList *l;
 	struct sr_dev_inst *sdi;
-	struct drv_context *drvc;
 	struct dev_context *devc;
 	int ret = SR_OK;
 
-	if (!(drvc = di->context))
-		return SR_OK;
-
 	/* Properly close and free all devices. */
 	for (l = drvc->instances; l; l = l->next) {
 		if (!(sdi = l->data)) {
@@ -90,7 +87,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-	return std_init(sr_ctx, di, LOG_PREFIX);
+	return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
@@ -228,11 +225,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-	return ((struct drv_context *)(di->context))->instances;
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
 	int ret;
@@ -467,7 +459,7 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
 	.init = init,
 	.cleanup = std_cleanup,
 	.scan = scan,
-	.dev_list = dev_list,
+	.dev_list = std_dev_list,
 	.dev_clear = dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,