baylibre-acme: Add Linux-specific GPIO helpers.

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

diff --git a/src/hardware/brymen-dmm/api.c b/src/hardware/brymen-dmm/api.c
index 937135c6c1b77657ec7125beb785105aae519f39..aef784e8ca314396e6ac7b08fc2291f5a069c58a 100644 (file)
--- a/src/hardware/brymen-dmm/api.c
+++ b/src/hardware/brymen-dmm/api.c
@@ -51,8 +51,7 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm)
        uint8_t buf[128];
        size_t len;
 
-       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;
@@ -79,21 +78,13 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm)
        sdi->status = SR_ST_INACTIVE;
        sdi->vendor = g_strdup("Brymen");
        sdi->model = g_strdup("BM85x");
-
-       if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-               sr_err("Device context malloc failed.");
-               goto scan_cleanup;
-       }
-
+       devc = g_malloc0(sizeof(struct dev_context));
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
        drvc = di->priv;
        sdi->priv = devc;
        sdi->driver = di;
-
-       if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
-               goto scan_cleanup;
-
+       ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1");
        sdi->channels = g_slist_append(sdi->channels, ch);
        drvc->instances = g_slist_append(drvc->instances, sdi);
        devices = g_slist_append(devices, sdi);