sr_driver_scan(): Improve checks.

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

diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c
index 819e1397873a8d481b4c2866c4d24eb4b6b22447..39e557a676ee2106fd9d232e82e6c154f0edcab7 100644 (file)
--- a/hardware/colead-slm/api.c
+++ b/hardware/colead-slm/api.c
@@ -78,7 +78,7 @@ static int hw_init(struct sr_context *sr_ctx)
 
        if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
                sr_err("Driver context malloc failed.");
-               return SR_ERR;
+               return SR_ERR_MALLOC;
        }
 
        drvc->sr_ctx = sr_ctx;
@@ -97,10 +97,11 @@ static GSList *hw_scan(GSList *options)
        GSList *devices, *l;
        const char *conn, *serialcomm;
 
-       devices = NULL;
        drvc = di->priv;
        drvc->instances = NULL;
 
+       devices = NULL;
+
        conn = serialcomm = NULL;
        for (l = options; l; l = l->next) {
                src = l->data;
@@ -123,7 +124,7 @@ static GSList *hw_scan(GSList *options)
                return NULL;
 
        if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-               sr_dbg("failed to malloc devc");
+               sr_dbg("Device context malloc failed.");
                return NULL;
        }
 
@@ -191,18 +192,6 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-       (void)sdi;
-
-       switch (id) {
-       default:
-               return SR_ERR_ARG;
-       }
-
-       return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -325,7 +314,6 @@ SR_PRIV struct sr_dev_driver colead_slm_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,