sr: remove obsolete SR_DI_INST

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 918a0e158307a47b785c3f0372751b1fd3dd15e3..f801f5876a8ec6b965456b6a95d482296b359d8d 100644 (file)
--- 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 61bbfc36b3715a5dbfc0135b3a6bc53a3088027e..f9320a00705e9a5177ed1ad571335f58329c9a48 100644 (file)
--- 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 89ea6df3e5c083dac9d8924d34eecc3fae3bb94c..8f6a4371d7a349df295616070f4b14d6606dd10b 100644 (file)
--- 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 4863da5ef22b7b5798c40789b657fb59e1b4423e..7a83b58ba53e1b89b846c7dc68f7bd5de4f99895 100644 (file)
--- 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 a8e13beeff7c119e29608cb5aec049ea4de733ff..ef5c144d1e5b05b4823973436ad7d9a0e970ff46 100644 (file)
--- 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 4efeb65eb0ce11fc42d7a7742236cef69c722e18..addc29032c27a99527d572f2293824a118a744cc 100644 (file)
--- 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 970f779331b84e29e8a9431d7aad02dba4ab9715..3112eece4fdae7985560305ade9294e4ed0488dd 100644 (file)
--- 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 683203aef28630a8ba69722eefdf98abbe91f7d9..fe57be65c08eb38cf13cfd4a5f4197b9cc17d9d0 100644 (file)
--- 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 e7b988c4a60afc3fe5e35ed37c9c13e0390a5ac6..31a38c80fd6906e3f9c4b3408e4130f927632a4b 100644 (file)
--- 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. */