drivers: Remove some uneeded 'ret' variables.

[libsigrok.git] / src / hardware / baylibre-acme / api.c

diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index 8e0af46df9bfc3147f5759fe9ab3cf9f71e2bf0a..c467991de3d993294c419f9151fa7dc72bd25cd7 100644 (file)
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -126,24 +126,6 @@ err_out:
        return NULL;
 }
 
-static int dev_open(struct sr_dev_inst *sdi)
-{
-       (void)sdi;
-
-       sdi->status = SR_ST_ACTIVE;
-
-       return SR_OK;
-}
-
-static int dev_close(struct sr_dev_inst *sdi)
-{
-       (void)sdi;
-
-       sdi->status = SR_ST_INACTIVE;
-
-       return SR_OK;
-}
-
 static int config_get(uint32_t key, GVariant **data,
                      const struct sr_dev_inst *sdi,
                      const struct sr_channel_group *cg)
@@ -193,9 +175,6 @@ static int config_set(uint32_t key, GVariant *data,
        uint64_t samplerate;
        int ret;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
        ret = SR_OK;
@@ -238,12 +217,11 @@ static int config_list(uint32_t key, GVariant **data,
        uint32_t devopts_cg[MAX_DEVOPTS_CG];
        GVariant *gvar;
        GVariantBuilder gvb;
-       int ret, num_devopts_cg = 0;
+       int num_devopts_cg = 0;
 
        (void)sdi;
        (void)cg;
 
-       ret = SR_OK;
        if (!cg) {
                switch (key) {
                case SR_CONF_DEVICE_OPTIONS:
@@ -277,7 +255,7 @@ static int config_list(uint32_t key, GVariant **data,
                }
        }
 
-       return ret;
+       return SR_OK;
 }
 
 static void dev_acquisition_close(const struct sr_dev_inst *sdi)
@@ -316,9 +294,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                .it_value = { 0, 0 }
        };
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        if (dev_acquisition_open(sdi))
                return SR_ERR;
 
@@ -382,11 +357,12 @@ static struct sr_dev_driver baylibre_acme_driver_info = {
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,
+       .dev_clear = std_dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
-       .dev_open = dev_open,
-       .dev_close = dev_close,
+       .dev_open = std_dummy_dev_open,
+       .dev_close = std_dummy_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,