drivers: Remove some uneeded 'ret' variables.

[libsigrok.git] / src / hardware / saleae-logic-pro / api.c

diff --git a/src/hardware/saleae-logic-pro/api.c b/src/hardware/saleae-logic-pro/api.c
index 74e3bbacc44b2fbfadcd8b45bfc5f0f4597b779b..8191e8da7cc1529d8203a9ed0dd210650c99d2a2 100644 (file)
--- a/src/hardware/saleae-logic-pro/api.c
+++ b/src/hardware/saleae-logic-pro/api.c
@@ -180,11 +180,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        return std_scan_complete(di, devices);
 }
 
-static int dev_clear(const struct sr_dev_driver *di)
-{
-       return std_dev_clear(di, NULL);
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
        struct sr_dev_driver *di = sdi->driver;
@@ -205,18 +200,12 @@ static int dev_open(struct sr_dev_inst *sdi)
        if (devc->dig_samplerate == 0)
                devc->dig_samplerate = samplerates[3];
 
-       sdi->status = SR_ST_ACTIVE;
-
        return SR_OK;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-       struct sr_usb_dev_inst *usb = sdi->conn;
-
-       sr_usb_close(usb);
-
-       sdi->status = SR_ST_INACTIVE;
+       sr_usb_close(sdi->conn);
 
        return SR_OK;
 }
@@ -226,11 +215,9 @@ static int config_get(uint32_t key, GVariant **data,
 {
        struct sr_usb_dev_inst *usb;
        struct dev_context *devc;
-       int ret;
 
        (void)cg;
 
-       ret = SR_OK;
        switch (key) {
        case SR_CONF_CONN:
                if (!sdi || !sdi->conn)
@@ -248,31 +235,27 @@ static int config_get(uint32_t key, GVariant **data,
                return SR_ERR_NA;
        }
 
-       return ret;
+       return SR_OK;
 }
 
 static int config_set(uint32_t key, GVariant *data,
                      const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
-       int ret;
 
        (void)cg;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
        devc = sdi->priv;
 
-       ret = SR_OK;
        switch (key) {
        case SR_CONF_SAMPLERATE:
                devc->dig_samplerate = g_variant_get_uint64(data);
                break;
        default:
-               ret = SR_ERR_NA;
+               return SR_ERR_NA;
        }
 
-       return ret;
+       return SR_OK;
 }
 
 static int config_list(uint32_t key, GVariant **data,
@@ -280,12 +263,10 @@ static int config_list(uint32_t key, GVariant **data,
 {
        GVariant *gvar;
        GVariantBuilder gvb;
-       int ret;
 
        (void)sdi;
        (void)cg;
 
-       ret = SR_OK;
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
@@ -311,7 +292,7 @@ static int config_list(uint32_t key, GVariant **data,
                return SR_ERR_NA;
        }
 
-       return ret;
+       return SR_OK;
 }
 
 static void dev_acquisition_abort(const struct sr_dev_inst *sdi)
@@ -329,7 +310,7 @@ static int dev_acquisition_handle(int fd, int revents, void *cb_data)
 {
        struct sr_dev_inst *sdi = cb_data;
        struct drv_context *drvc = sdi->driver->context;
-       struct timeval tv = {};
+       struct timeval tv = ALL_ZERO;
 
        (void)fd;
        (void)revents;
@@ -348,9 +329,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        uint8_t *buf;
        unsigned int i, ret;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        ret = saleae_logic_pro_init(sdi);
        if (ret != SR_OK)
                return ret;
@@ -399,9 +377,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        struct dev_context *devc = sdi->priv;
        struct drv_context *drvc = sdi->driver->context;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        saleae_logic_pro_stop(sdi);
 
        std_session_send_df_end(sdi);
@@ -421,7 +396,7 @@ SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info = {
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,
-       .dev_clear = dev_clear,
+       .dev_clear = std_dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,