X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdevice.c;h=6fcad410f2bc3802f979f7bb2f9687b755861940;hb=641107aa6c5864bd5d66f3f6dafa7c2493d55de5;hp=1394fb3be34b6aa874dab6e15e111a5d01d58a66;hpb=91057d2fc24c0ca058aa08c8ea6ada4eadf05ffd;p=libsigrok.git

diff --git a/src/device.c b/src/device.c
index 1394fb3b..6fcad410 100644
--- 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;
@@ -548,12 +546,7 @@ SR_API int sr_dev_clear(const struct sr_dev_driver *driver)
 
 	/* No log message here, too verbose and not very useful. */
 
-	if (driver->dev_clear)
-		ret = driver->dev_clear(driver);
-	else
-		ret = std_dev_clear(driver, NULL);
-
-	return ret;
+	return driver->dev_clear(driver);
 }
 
 /**
@@ -617,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;
 
@@ -632,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);
 }
 
 /**