Various drivers: Drop some unneeded lines.

[libsigrok.git] / hardware / norma-dmm / api.c

diff --git a/hardware/norma-dmm/api.c b/hardware/norma-dmm/api.c
index 35a5d7068434fa8451ae28b41287666f153f4047..6860a783d6ebfeb2db31e42de9bdd77ef8aae0aa 100644 (file)
--- a/hardware/norma-dmm/api.c
+++ b/hardware/norma-dmm/api.c
@@ -49,7 +49,7 @@ static GSList *scan(GSList *options)
        struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_config *src;
-       struct sr_probe *probe;
+       struct sr_channel *ch;
        struct sr_serial_dev_inst *serial;
        GSList *l, *devices;
        int len, cnt;
@@ -128,10 +128,10 @@ static GSList *scan(GSList *options)
                        sdi->conn = serial;
                        sdi->priv = devc;
                        sdi->driver = di;
-                       if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE,
+                       if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE,
                                "P1")))
                                return NULL;
-                       sdi->probes = g_slist_append(sdi->probes, probe);
+                       sdi->channels = g_slist_append(sdi->channels, ch);
                        drvc->instances = g_slist_append(drvc->instances, sdi);
                        devices = g_slist_append(devices, sdi);
                        break;
@@ -250,9 +250,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
 
-       (void)sdi;
-       (void)cb_data;
-
        if (!sdi || !cb_data || !(devc = sdi->priv))
                return SR_ERR_BUG;