std_init(): Drop check if pass in driver is non-NULL

[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 b03c3a65f5e1b27fa90b5b4408287821c15b38dd..3f2a54a1b9a7aba7d2af65d142e567948f2ca247 100644 (file)
--- a/src/hardware/deree-de5000/api.c
+++ b/src/hardware/deree-de5000/api.c
@@ -35,21 +35,16 @@ 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);
 }
 
-static int cleanup(const struct sr_dev_driver *di)
+static int dev_clear(const struct sr_dev_driver *di)
 {
        return std_dev_clear(di, es51919_serial_clean);
 }
@@ -71,10 +66,10 @@ 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_clear = NULL,
+       .dev_list = std_dev_list,
+       .dev_clear = dev_clear,
        .config_get = es51919_serial_config_get,
        .config_set = es51919_serial_config_set,
        .config_list = es51919_serial_config_list,