Introduce standard cleanup helper

[libsigrok.git] / src / hardware / zeroplus-logic-cube / api.c

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index 22ec33b544ac3d8218b9bb0fe960d3254f63cd0e..f9f2ba795d6bd4185e834a226d7f98f0c156b8bc 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);
@@ -377,11 +373,6 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-       return std_dev_clear(di, NULL);
-}
-
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
@@ -694,16 +685,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       struct dev_context *devc;
        struct sr_usb_dev_inst *usb;
 
        std_session_send_df_end(sdi, LOG_PREFIX);
 
-       if (!(devc = sdi->priv)) {
-               sr_err("%s: sdi->priv was NULL", __func__);
-               return SR_ERR_BUG;
-       }
-
        usb = sdi->conn;
        analyzer_reset(usb->devhdl);
        /* TODO: Need to cancel and free any queued up transfers. */
@@ -716,7 +701,7 @@ SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = {
        .longname = "ZEROPLUS Logic Cube LAP-C series",
        .api_version = 1,
        .init = init,
-       .cleanup = cleanup,
+       .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = dev_list,
        .dev_clear = NULL,