drivers: Remove some unneeded 'ret' variables.

[libsigrok.git] / src / hardware / conrad-digi-35-cpu / api.c

diff --git a/src/hardware/conrad-digi-35-cpu/api.c b/src/hardware/conrad-digi-35-cpu/api.c
index d1454acbf404f7f5aba5ca28decf8e82a702be24..1f0d220a058bfab5768a48a0885fcb8ed614750a 100644 (file)
--- a/src/hardware/conrad-digi-35-cpu/api.c
+++ b/src/hardware/conrad-digi-35-cpu/api.c
@@ -17,14 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**
- * @file
- *
- * <em>Conrad DIGI 35 CPU</em> power supply driver
- *
- * @internal
- */
-
 #include <config.h>
 #include "protocol.h"
 
@@ -98,10 +90,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        return std_scan_complete(di, g_slist_append(NULL, sdi));
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-       int ret;
        double dblval;
 
        (void)cg;
@@ -113,31 +104,28 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                        sr_err("Voltage out of range (0 - 35.0)!");
                        return SR_ERR_ARG;
                }
-               ret = send_msg1(sdi, 'V', (int) (dblval * 10 + 0.5));
-               break;
+               return send_msg1(sdi, 'V', (int) (dblval * 10 + 0.5));
        case SR_CONF_CURRENT:
                dblval = g_variant_get_double(data);
                if ((dblval < 0.01) || (dblval > 2.55)) {
                        sr_err("Current out of range (0 - 2.55)!");
                        return SR_ERR_ARG;
                }
-               ret = send_msg1(sdi, 'C', (int) (dblval * 100 + 0.5));
-               break;
+               return send_msg1(sdi, 'C', (int) (dblval * 100 + 0.5));
        case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED:
                if (g_variant_get_boolean(data))
-                       ret = send_msg1(sdi, 'V', 900);
+                       return send_msg1(sdi, 'V', 900);
                else /* Constant current mode */
-                       ret = send_msg1(sdi, 'V', 901);
-               break;
+                       return send_msg1(sdi, 'V', 901);
        default:
-               ret = SR_ERR_NA;
+               return SR_ERR_NA;
        }
 
-       return ret;
+       return SR_OK;
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 }