X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fapi.c;h=f635383034b81f43862fb976564b574031e4e0e5;hb=b0baddef5620c5783080d0e8811e668fbc2b38f5;hp=faee455c42408eebaeadf93cc5d4f565e6c8f988;hpb=c01bf34ca264b268fee2e71ab918c71d28dc3018;p=libsigrok.git

diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index faee455c..f6353830 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)) {
@@ -88,11 +85,6 @@ static int dev_clear(const struct sr_dev_driver *di)
 	return ret;
 }
 
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-	return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	int i;
@@ -292,6 +284,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 	double pos;
 
 	(void)cg;
+
 	devc = sdi->priv;
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -459,7 +452,7 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
 	.name = "link-mso19",
 	.longname = "Link Instruments MSO-19",
 	.api_version = 1,
-	.init = init,
+	.init = std_init,
 	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = std_dev_list,