Simplify channel creation.

[libsigrok.git] / src / hardware / tondaj-sl-814 / api.c

diff --git a/src/hardware/tondaj-sl-814/api.c b/src/hardware/tondaj-sl-814/api.c
index 1b40b9f6f593d23d280517f070a7fd5bbf1d6d8d..cccaeb1d23f47a16d5683827ccdb13a2d95bb563 100644 (file)
--- a/src/hardware/tondaj-sl-814/api.c
+++ b/src/hardware/tondaj-sl-814/api.c
@@ -51,7 +51,6 @@ static GSList *scan(GSList *options)
        struct dev_context *devc;
        struct sr_dev_inst *sdi;
        struct sr_config *src;
-       struct sr_channel *ch;
        GSList *devices, *l;
        const char *conn, *serialcomm;
        struct sr_serial_dev_inst *serial;
@@ -90,8 +89,7 @@ static GSList *scan(GSList *options)
        sdi->model = g_strdup("SL-814");
        devc = g_malloc0(sizeof(struct dev_context));
 
-       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;
@@ -101,8 +99,7 @@ static GSList *scan(GSList *options)
 
        sdi->priv = devc;
        sdi->driver = di;
-       ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1");
-       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);