Match std_init() parameter order to the driver init() callback

[libsigrok.git] / src / hardware / hung-chang-dso-2100 / api.c

diff --git a/src/hardware/hung-chang-dso-2100/api.c b/src/hardware/hung-chang-dso-2100/api.c
index fecd593c375f4b4803cc378fef3ef30eca0ff575..eb2246f61a6a8465dfd1cb7b58ba386efc80524a 100644 (file)
--- a/src/hardware/hung-chang-dso-2100/api.c
+++ b/src/hardware/hung-chang-dso-2100/api.c
@@ -106,7 +106,7 @@ static const uint8_t coupling_map[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan_port(GSList *devices, struct sr_dev_driver *di,
@@ -230,11 +230,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-       return ((struct drv_context *)(di->context))->instances;
-}
-
 static void clear_private(void *priv)
 {
        struct dev_context *devc = priv;
@@ -311,18 +306,6 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-       struct drv_context *drvc = di->context;
-       int ret;
-
-       ret = dev_clear(di);
-
-       g_free(drvc);
-
-       return ret;
-}
-
 static int find_in_array(GVariant *data, const GVariantType *type,
                         const void *arr, int n)
 {
@@ -741,9 +724,9 @@ SR_PRIV struct sr_dev_driver hung_chang_dso_2100_driver_info = {
        .longname = "Hung-Chang DSO-2100",
        .api_version = 1,
        .init = init,
-       .cleanup = cleanup,
+       .cleanup = std_cleanup,
        .scan = scan,
-       .dev_list = dev_list,
+       .dev_list = std_dev_list,
        .dev_clear = dev_clear,
        .config_get = config_get,
        .config_set = config_set,