Simplify channel creation.

[libsigrok.git] / src / hardware / colead-slm / api.c

diff --git a/src/hardware/colead-slm/api.c b/src/hardware/colead-slm/api.c
index e879a102189c19ad4f7c8df2091c34c27514d3ff..6e907cec355e476b2339edab89d1f10cc0edcd95 100644 (file)
--- a/src/hardware/colead-slm/api.c
+++ b/src/hardware/colead-slm/api.c
@@ -56,7 +56,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;
 
@@ -86,21 +85,12 @@ static GSList *scan(GSList *options)
        sdi->status = SR_ST_INACTIVE;
        sdi->vendor = g_strdup("Colead");
        sdi->model = g_strdup("SL-5868P");
-
-       if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-               sr_dbg("Device context malloc failed.");
-               return NULL;
-       }
-
-       if (!(sdi->conn = sr_serial_dev_inst_new(conn, serialcomm)))
-               return NULL;
-
+       devc = g_malloc0(sizeof(struct dev_context));
+       sdi->conn = sr_serial_dev_inst_new(conn, serialcomm);
        sdi->inst_type = SR_INST_SERIAL;
        sdi->priv = devc;
        sdi->driver = di;
-       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);