Remove unnecessary dev_clear() callbacks

[libsigrok.git] / src / std.c

diff --git a/src/std.c b/src/std.c
index adbd2e52b6fa14d0c34554d8f9f4b62fe43090c9..b66ed8f0b4884c603d4e235a972775c1a1ab40c6 100644 (file)
--- a/src/std.c
+++ b/src/std.c
@@ -63,6 +63,28 @@ SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
        return SR_OK;
 }
 
+/**
+ * Standard driver cleanup() callback API helper
+ *
+ * @param di The driver instance to use.
+ *
+ * Frees all device instances by calling sr_dev_clear() and then releases any
+ * resources allocated by std_init().
+ *
+ * @retval SR_OK Success
+ * @retval SR_ERR_ARG Invalid driver
+ *
+*/
+SR_PRIV int std_cleanup(const struct sr_dev_driver *di)
+{
+       int ret;
+
+       ret = sr_dev_clear(di);
+       g_free(di->context);
+
+       return ret;
+}
+
 /**
  * Standard API helper for sending an SR_DF_HEADER packet.
  *
@@ -211,7 +233,7 @@ SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi)
  * @retval SR_ERR Other errors.
  */
 SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
-                       void *cb_data, dev_close_callback dev_close_fn,
+                       dev_close_callback dev_close_fn,
                        struct sr_serial_dev_inst *serial, const char *prefix)
 {
        int ret;
@@ -238,7 +260,7 @@ SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
                return ret;
        }
 
-       std_session_send_df_end(cb_data, prefix);
+       std_session_send_df_end(sdi, prefix);
 
        return SR_OK;
 }