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

[libsigrok.git] / src / hardware / deree-de5000 / api.c

diff --git a/src/hardware/deree-de5000/api.c b/src/hardware/deree-de5000/api.c
index 8619ccfbd3f66537aff0ef2597cdc590a01c1784..7a832022789adb9fe47cec018f8ad91faf37b519 100644 (file)
--- a/src/hardware/deree-de5000/api.c
+++ b/src/hardware/deree-de5000/api.c
@@ -35,18 +35,13 @@ static void std_dev_attach(struct sr_dev_driver *di, struct sr_dev_inst *sdi)
        drvc->instances = g_slist_append(drvc->instances, sdi);
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-       return ((struct drv_context *)di->context)->instances;
-}
-
 #define LOG_PREFIX "deree-de5000"
 
 SR_PRIV struct sr_dev_driver deree_de5000_driver_info;
 
 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 int dev_clear(const struct sr_dev_driver *di)
@@ -54,11 +49,6 @@ static int dev_clear(const struct sr_dev_driver *di)
        return std_dev_clear(di, es51919_serial_clean);
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-       return dev_clear(di);
-}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct sr_dev_inst *sdi;
@@ -76,9 +66,9 @@ SR_PRIV struct sr_dev_driver deree_de5000_driver_info = {
        .longname = "DER EE DE-5000",
        .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 = es51919_serial_config_get,
        .config_set = es51919_serial_config_set,