Simplify channel creation.

[libsigrok.git] / src / hardware / brymen-bm86x / api.c

diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c
index f22535419fffdc8378c9bda879a2e0f290ada147..87d2e5af0ce597102d975e5abf20c43d40672af8 100644 (file)
--- a/src/hardware/brymen-bm86x/api.c
+++ b/src/hardware/brymen-bm86x/api.c
@@ -48,7 +48,6 @@ static GSList *scan(GSList *options)
        struct sr_dev_inst *sdi;
        struct sr_usb_dev_inst *usb;
        struct sr_config *src;
-       struct sr_channel *ch;
        const char *conn;
 
        drvc = di->priv;
@@ -73,25 +72,15 @@ static GSList *scan(GSList *options)
        for (l = usb_devices; l; l = l->next) {
                usb = l->data;
 
-               if (!(sdi = sr_dev_inst_new(SR_ST_INACTIVE,
-                                           "Brymen", "BM869", NULL))) {
-                       sr_err("sr_dev_inst_new returned NULL.");
-                       return NULL;
-               }
-
-               if (!(devc = g_try_malloc0(sizeof(*devc)))) {
-                       sr_err("Device context malloc failed.");
-                       return NULL;
-               }
-
+               sdi = g_malloc0(sizeof(struct sr_dev_inst));
+               sdi->status = SR_ST_INACTIVE;
+               sdi->vendor = g_strdup("Brymen");
+               sdi->model = g_strdup("BM869");
+               devc = g_malloc0(sizeof(struct dev_context));
                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);
-               if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P2")))
-                       return NULL;
-               sdi->channels = g_slist_append(sdi->channels, ch);
+               sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
+               sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P2");
 
                sdi->inst_type = SR_INST_USB;
                sdi->conn = usb;