dev_open(): Don't check for sdi != NULL.

The wrapper guarantees that sdi is not NULL.

diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c
index d8de0da1f96f655965174da40491fda2419017db..040a9c4b087f66b2c87c40555ada19a5ce78025a 100644 (file)
--- a/src/hardware/chronovu-la/api.c
+++ b/src/hardware/chronovu-la/api.c
@@ -255,8 +255,7 @@ static int dev_open(struct sr_dev_inst *sdi)
        struct dev_context *devc;
        int ret;
 
-       if (!(devc = sdi->priv))
-               return SR_ERR_BUG;
+       devc = sdi->priv;
 
        /* Allocate memory for the FTDI context and initialize it. */
        if (!(devc->ftdic = ftdi_new())) {

diff --git a/src/hardware/hp-3457a/api.c b/src/hardware/hp-3457a/api.c
index 05a45e6295905f7ef31086b14b6e5fb114a620c0..b152be9236427aafa61f02fcfc051c18d8128852 100644 (file)
--- a/src/hardware/hp-3457a/api.c
+++ b/src/hardware/hp-3457a/api.c
@@ -213,7 +213,7 @@ static int dev_open(struct sr_dev_inst *sdi)
        if (sr_scpi_open(scpi) != SR_OK)
                return SR_ERR;
 
-       devc=sdi->priv;
+       devc = sdi->priv;
 
        sr_scpi_send(scpi, "PRESET");
        sr_scpi_send(scpi, "INBUF ON");

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index c85a40892b69a297317d67c6267bfe0552c3f4d9..22e949c98ad98d90ec51c4174cbf5750daae6d4f 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -273,11 +273,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 
        drvc = di->context;
        usb = sdi->conn;
-
-       if (!(devc = sdi->priv)) {
-               sr_err("%s: sdi->priv was NULL", __func__);
-               return SR_ERR_ARG;
-       }
+       devc = sdi->priv;
 
        device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx,
                                              &devlist);