Various log message cleanups.

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

diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c
index 484e1476707da7f1a1556140d80e455f3bbbbd29..5a5f358008c3ac74f04d3345cc8bc7545ba85ed3 100644 (file)
--- a/src/hardware/brymen-bm86x/api.c
+++ b/src/hardware/brymen-bm86x/api.c
@@ -95,9 +95,7 @@ static int dev_open(struct sr_dev_inst *sdi)
        usb = sdi->conn;
        devc = sdi->priv;
 
-       if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) == SR_OK)
-               sdi->status = SR_ST_ACTIVE;
-       else
+       if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) < 0)
                return SR_ERR;
 
        /* Detach kernel drivers which grabbed this device (if any). */
@@ -109,9 +107,6 @@ static int dev_open(struct sr_dev_inst *sdi)
                        return SR_ERR;
                }
                devc->detached_kernel_driver = 1;
-               sr_dbg("Successfully detached kernel driver.");
-       } else {
-               sr_dbg("No need to detach a kernel driver.");
        }
 
        /* Claim interface 0. */
@@ -120,9 +115,8 @@ static int dev_open(struct sr_dev_inst *sdi)
                       libusb_error_name(ret));
                return SR_ERR;
        }
-       sr_dbg("Successfully claimed interface 0.");
 
-       return ret;
+       return SR_OK;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
@@ -131,32 +125,23 @@ static int dev_close(struct sr_dev_inst *sdi)
        struct dev_context *devc;
        int ret;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        usb = sdi->conn;
        devc = sdi->priv;
 
        if ((ret = libusb_release_interface(usb->devhdl, 0)))
                sr_err("Failed to release interface 0: %s.\n", libusb_error_name(ret));
-       else
-               sr_dbg("Successfully released interface 0.\n");
 
        if (!ret && devc->detached_kernel_driver) {
-               if ((ret = libusb_attach_kernel_driver(usb->devhdl, 0))) {
+               if ((ret = libusb_attach_kernel_driver(usb->devhdl, 0)))
                        sr_err("Failed to attach kernel driver: %s.\n",
                               libusb_error_name(ret));
-               } else {
+               else
                        devc->detached_kernel_driver = 0;
-                       sr_dbg("Successfully attached kernel driver.\n");
-               }
        }
 
        libusb_close(usb->devhdl);
 
-       sdi->status = SR_ST_INACTIVE;
-
-       return ret;
+       return (ret == 0) ? SR_OK : SR_ERR;
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -176,9 +161,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
        (void)cg;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
        return sr_sw_limits_config_set(&devc->sw_limits, key, data);
@@ -210,9 +192,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
        sr_sw_limits_acquisition_start(&devc->sw_limits);