X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fgenericdmm%2Fapi.c;h=c182b039d1110dea7520d6c70c8c2622e64619f2;hb=25a0f108f4512ade836fed128c3ad649dedcb788;hp=f29aafd153ad3b002d902abf84ac3e1896b50deb;hpb=58453e5876ffae9153e9f4ddc2ad8dc244c7f26d;p=libsigrok.git

diff --git a/hardware/genericdmm/api.c b/hardware/genericdmm/api.c
index f29aafd1..c182b039 100644
--- a/hardware/genericdmm/api.c
+++ b/hardware/genericdmm/api.c
@@ -325,16 +325,10 @@ static GSList *hw_scan(GSList *options)
 	return devices;
 }
 
-static int hw_dev_open(int dev_index)
+static int hw_dev_open(struct sr_dev_inst *sdi)
 {
-	struct sr_dev_inst *sdi;
 	struct context *ctx;
 
-	if (!(sdi = sr_dev_inst_get(gdi->instances, dev_index))) {
-		sr_err("genericdmm: sdi was NULL.");
-		return SR_ERR_BUG;
-	}
-
 	if (!(ctx = sdi->priv)) {
 		sr_err("genericdmm: sdi->priv was NULL.");
 		return SR_ERR_BUG;
@@ -363,23 +357,15 @@ static int hw_dev_open(int dev_index)
 	return SR_OK;
 }
 
-static int hw_dev_close(int dev_index)
+static int hw_dev_close(struct sr_dev_inst *sdi)
 {
-	struct sr_dev_inst *sdi;
 	struct context *ctx;
 
-	if (!(sdi = sr_dev_inst_get(gdi->instances, dev_index))) {
-		sr_err("genericdmm: %s: sdi was NULL.", __func__);
-		return SR_ERR_BUG;
-	}
-
 	if (!(ctx = sdi->priv)) {
 		sr_err("genericdmm: %s: sdi->priv was NULL.", __func__);
 		return SR_ERR_BUG;
 	}
 
-	/* TODO: Check for != NULL. */
-
 	switch (ctx->profile->transport) {
 	case DMM_TRANSPORT_USBHID:
 		/* TODO */