bindings/python: include config.h before any other header file

[libsigrok.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index e58c1790f2c166204779f8ba0069a1903292fa55..6fcad410f2bc3802f979f7bb2f9687b755861940 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -529,8 +529,6 @@ SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver)
  */
 SR_API int sr_dev_clear(const struct sr_dev_driver *driver)
 {
-       int ret;
-
        if (!driver) {
                sr_err("Invalid driver.");
                return SR_ERR_ARG;
@@ -546,12 +544,9 @@ SR_API int sr_dev_clear(const struct sr_dev_driver *driver)
                return SR_OK;
        }
 
-       if (driver->dev_clear)
-               ret = driver->dev_clear(driver);
-       else
-               ret = std_dev_clear(driver, NULL);
+       /* No log message here, too verbose and not very useful. */
 
-       return ret;
+       return driver->dev_clear(driver);
 }
 
 /**
@@ -615,8 +610,6 @@ SR_API int sr_dev_open(struct sr_dev_inst *sdi)
  */
 SR_API int sr_dev_close(struct sr_dev_inst *sdi)
 {
-       int ret;
-
        if (!sdi || !sdi->driver || !sdi->driver->dev_close)
                return SR_ERR_ARG;
 
@@ -630,9 +623,7 @@ SR_API int sr_dev_close(struct sr_dev_inst *sdi)
 
        sr_dbg("%s: Closing device instance.", sdi->driver->name);
 
-       ret = sdi->driver->dev_close(sdi);
-
-       return ret;
+       return sdi->driver->dev_close(sdi);
 }
 
 /**