drivers: Use ARRAY_AND_SIZE where possible.

[libsigrok.git] / src / hardware / ikalogic-scanalogic2 / api.c

diff --git a/src/hardware/ikalogic-scanalogic2/api.c b/src/hardware/ikalogic-scanalogic2/api.c
index 8b9e7f169d9fe1b7bbaeb48d80f5a790027c04cd..1b2a26f446085719aaa2ea47d4aa5cf6e7a3dc35 100644 (file)
--- a/src/hardware/ikalogic-scanalogic2/api.c
+++ b/src/hardware/ikalogic-scanalogic2/api.c
@@ -181,10 +181,6 @@ static int dev_open(struct sr_dev_inst *sdi)
        if (sr_usb_open(drvc->sr_ctx->libusb_ctx, usb) != SR_OK)
                return SR_ERR;
 
-       /*
-        * Determine if a kernel driver is active on this interface and, if so,
-        * detach it.
-        */
        if (libusb_kernel_driver_active(usb->devhdl, USB_INTERFACE) == 1) {
                ret = libusb_detach_kernel_driver(usb->devhdl, USB_INTERFACE);
                if (ret < 0) {
@@ -304,24 +300,16 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
-       GVariant *gvar, *grange[2];
-       GVariantBuilder gvb;
+       GVariant *grange[2];
 
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
                return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
        case SR_CONF_SAMPLERATE:
-               g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
-               gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
-                       sl2_samplerates, ARRAY_SIZE(sl2_samplerates),
-                       sizeof(uint64_t));
-               g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
-               *data = g_variant_builder_end(&gvb);
+               *data = std_gvar_samplerates(ARRAY_AND_SIZE(sl2_samplerates));
                break;
        case SR_CONF_TRIGGER_MATCH:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-                               trigger_matches, ARRAY_SIZE(trigger_matches),
-                               sizeof(int32_t));
+               *data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));
                break;
        case SR_CONF_LIMIT_SAMPLES:
                grange[0] = g_variant_new_uint64(0);