fx2lafw: Replace obsoleted strncmp() calls.

[libsigrok.git] / src / hardware / cem-dt-885x / api.c

diff --git a/src/hardware/cem-dt-885x/api.c b/src/hardware/cem-dt-885x/api.c
index c8ca2b8f7a648b9003aa1eb9aee05052a6961ae2..d91c5509b1f55fa908adb1377aad0637313b4e01 100644 (file)
--- a/src/hardware/cem-dt-885x/api.c
+++ b/src/hardware/cem-dt-885x/api.c
@@ -97,8 +97,7 @@ static GSList *scan(GSList *options)
        if (!conn)
                return NULL;
 
-       if (!(serial = sr_serial_dev_inst_new(conn, SERIALCOMM)))
-               return NULL;
+       serial = sr_serial_dev_inst_new(conn, SERIALCOMM);
 
        if (serial_open(serial, SERIAL_RDONLY) != SR_OK)
                return NULL;
@@ -113,25 +112,17 @@ static GSList *scan(GSList *options)
                        sdi->status = SR_ST_INACTIVE;
                        sdi->vendor = g_strdup("CEM");
                        sdi->model = g_strdup("DT-885x");
-
-                       if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-                               sr_dbg("Device context malloc failed.");
-                               return NULL;
-                       }
+                       devc = g_malloc0(sizeof(struct dev_context));
                        devc->cur_mqflags = 0;
                        devc->recording = -1;
                        devc->cur_meas_range = 0;
                        devc->cur_data_source = DATA_SOURCE_LIVE;
                        devc->enable_data_source_memory = FALSE;
-
-                       if (!(sdi->conn = sr_serial_dev_inst_new(conn, SERIALCOMM)))
-                               return NULL;
-
+                       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, "SPL")))
-                               return NULL;
+                       ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "SPL");
                        sdi->channels = g_slist_append(sdi->channels, ch);
                        drvc->instances = g_slist_append(drvc->instances, sdi);
                        devices = g_slist_append(devices, sdi);