Remove unnecessary driver context checks

[libsigrok.git] / src / hardware / lecroy-logicstudio / api.c

diff --git a/src/hardware/lecroy-logicstudio/api.c b/src/hardware/lecroy-logicstudio/api.c
index 06f9b503d3d9004186b5e638bd576c767cbb35c3..b6c5116083f4822c457212e4f1e1879035b4bb4d 100644 (file)
--- a/src/hardware/lecroy-logicstudio/api.c
+++ b/src/hardware/lecroy-logicstudio/api.c
@@ -191,16 +191,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 int dev_clear(const struct sr_dev_driver *di)
-{
-       return std_dev_clear(di, NULL);
-}
-
 static int open_device(struct sr_dev_inst *sdi)
 {
        struct drv_context *drvc;
@@ -273,19 +263,12 @@ static int open_device(struct sr_dev_inst *sdi)
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
-       struct drv_context *drvc;
        struct dev_context *devc;
        int64_t timediff_us, timediff_ms;
        int ret;
 
-       drvc = sdi->driver->context;
        devc = sdi->priv;
 
-       if (!drvc) {
-               sr_err("Driver was not initialized.");
-               return SR_ERR;
-       }
-
        /*
         * If we didn't need to upload FX2 firmware in scan(), open the device
         * right away. Otherwise, wait up to MAX_RENUM_DELAY_MS ms for the
@@ -529,8 +512,7 @@ SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info = {
        .init = init,
        .cleanup = std_cleanup,
        .scan = scan,
-       .dev_list = dev_list,
-       .dev_clear = dev_clear,
+       .dev_list = std_dev_list,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,