Removal of sdi->index, step 4: fix trivial sr_dev_inst_new() calls

[libsigrok.git] / src / hardware / yokogawa-dlm / api.c

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index 99318764b0e44600fdcfa414f1b12b387306489c..dfecfb18af0ec251d13e1f1dca68a23d017e2681 100644 (file)
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -62,7 +62,7 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
        if (dlm_model_get(hw_info->model, &model_name, &model_index) != SR_OK)
                goto fail;
 
-       if (!(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, MANUFACTURER_NAME,
+       if (!(sdi = sr_dev_inst_new(SR_ST_ACTIVE, MANUFACTURER_NAME,
                        model_name, NULL)))
                goto fail;
 
@@ -477,16 +477,13 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        model = devc->model_config;
 
        switch (key) {
-       case SR_CONF_SCAN_OPTIONS:
-               *data = NULL;
-               break;
        case SR_CONF_DEVICE_OPTIONS:
                if (cg_type == CG_NONE) {
                        *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
                                model->devopts, model->num_devopts, sizeof(uint32_t));
                } else if (cg_type == CG_ANALOG) {
                        *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               model->analog_devopts, model->num_analog_devopts,       sizeof(uint32_t));
+                               model->analog_devopts, model->num_analog_devopts, sizeof(uint32_t));
                } else {
                        *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
                                NULL, 0, sizeof(uint32_t));