]> sigrok.org Git - libsigrok.git/blobdiff - src/hardware/norma-dmm/api.c
Simplify channel creation.
[libsigrok.git] / src / hardware / norma-dmm / api.c
index a0e53fc4d1b2983e729b9e3f2bc80ae6c74fc364..174425b709e4087d9e2aaf9352d21c69f2cd1144 100644 (file)
@@ -82,7 +82,6 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
        struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_config *src;
-       struct sr_channel *ch;
        struct sr_serial_dev_inst *serial;
        GSList *l, *devices;
        int len, cnt;
@@ -112,8 +111,7 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
        if (!serialcomm)
                serialcomm = SERIALCOMM;
 
-       if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
-               return NULL;
+       serial = sr_serial_dev_inst_new(conn, serialcomm);
 
        if (serial_open(serial, SERIAL_RDWR) != SR_OK)
                return NULL;
@@ -156,10 +154,7 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
                        sdi->conn = serial;
                        sdi->priv = devc;
                        sdi->driver = drv;
-                       if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE,
-                               "P1")))
-                               return NULL;
-                       sdi->channels = g_slist_append(sdi->channels, ch);
+                       sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
                        drvc->instances = g_slist_append(drvc->instances, sdi);
                        devices = g_slist_append(devices, sdi);
                        break;