From 6f57fd96949e4290933ac175c6c82d56965f7665 Mon Sep 17 00:00:00 2001
From: Bert Vermeulen <bert@biot.com>
Date: Wed, 25 Jul 2012 00:33:38 +0200
Subject: [PATCH] sr: remove obsolete SR_DI_INST

---
 hardware/asix-sigma/asix-sigma.c        | 3 ---
 hardware/chronovu-la8/api.c             | 4 ----
 hardware/demo/demo.c                    | 5 ++---
 hardware/fx2lafw/fx2lafw.c              | 3 ---
 hardware/genericdmm/api.c               | 7 +++----
 hardware/hantek-dso/api.c               | 5 ++---
 hardware/openbench-logic-sniffer/ols.c  | 3 ---
 hardware/zeroplus-logic-cube/zeroplus.c | 4 ----
 libsigrok.h                             | 3 ---
 9 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 918a0e15..f801f587 100644
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -786,9 +786,6 @@ static int hw_info_get(int info_id, const void **data,
 	struct context *ctx;
 
 	switch (info_id) {
-	case SR_DI_INST:
-		*data = sdi;
-		break;
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
diff --git a/hardware/chronovu-la8/api.c b/hardware/chronovu-la8/api.c
index 61bbfc36..f9320a00 100644
--- a/hardware/chronovu-la8/api.c
+++ b/hardware/chronovu-la8/api.c
@@ -271,10 +271,6 @@ static int hw_info_get(int info_id, const void **data,
 	struct context *ctx;
 
 	switch (info_id) {
-	case SR_DI_INST:
-		*data = sdi;
-		sr_spew("la8: %s: Returning sdi.", __func__);
-		break;
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 89ea6df3..8f6a4371 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -209,10 +209,9 @@ static int hw_info_get(int info_id, const void **data,
        const struct sr_dev_inst *sdi)
 {
 
+	(void)sdi;
+
 	switch (info_id) {
-	case SR_DI_INST:
-		*data = sdi;
-		break;
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 4863da5e..7a83b58b 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -600,9 +600,6 @@ static int hw_info_get(int info_id, const void **data,
 	struct context *ctx;
 
 	switch (info_id) {
-	case SR_DI_INST:
-		*data = sdi;
-		break;
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
diff --git a/hardware/genericdmm/api.c b/hardware/genericdmm/api.c
index a8e13bee..ef5c144d 100644
--- a/hardware/genericdmm/api.c
+++ b/hardware/genericdmm/api.c
@@ -431,11 +431,10 @@ static int hw_info_get(int info_id, const void **data,
 {
 	struct context *ctx;
 
+	(void)sdi;
+	(void)ctx;
+
 	switch (info_id) {
-	case SR_DI_INST:
-		*data = sdi;
-		sr_spew("genericdmm: Returning sdi.");
-		break;
 	case SR_DI_HWOPTS:
 		*data = hwopts;
 		break;
diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 4efeb65e..addc2903 100644
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -397,10 +397,9 @@ static int hw_info_get(int info_id, const void **data,
 {
 	uint64_t tmp;
 
+	(void)sdi;
+
 	switch (info_id) {
-	case SR_DI_INST:
-		*data = sdi;
-		break;
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index 970f7793..3112eece 100644
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -579,9 +579,6 @@ static int hw_info_get(int info_id, const void **data,
 	struct context *ctx;
 
 	switch (info_id) {
-	case SR_DI_INST:
-		*data = sdi;
-		break;
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 683203ae..fe57be65 100644
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -463,10 +463,6 @@ static int hw_info_get(int info_id, const void **data,
 	struct context *ctx;
 
 	switch (info_id) {
-	case SR_DI_INST:
-		*data = sdi;
-		sr_spew("zp: %s: Returning sdi.", __func__);
-		break;
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
diff --git a/libsigrok.h b/libsigrok.h
index e7b988c4..31a38c80 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -436,9 +436,6 @@ enum {
 
 /* Device info IDs */
 enum {
-	/* struct sr_dev_inst for this specific device */
-	/* TODO: obsolete */
-	SR_DI_INST,
 	/* A list of options supported by the driver. */
 	SR_DI_HWOPTS,
 	/* A list of capabilities supported by the device. */