config_set(): Don't check for sdi->priv != NULL.

[libsigrok.git] / src / hardware / hameg-hmo / api.c

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index b810b9f1d6d42d1d7083c23bf4d2cb2a5d1be13e..afe648911a06f4e2e106bf228ac45a5935fa3412 100644 (file)
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -47,11 +47,6 @@ enum {
        CG_DIGITAL,
 };
 
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 static int check_manufacturer(const char *manufacturer)
 {
        unsigned int i;
@@ -323,9 +318,11 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        double tmp_d;
        gboolean update_sample_rate;
 
-       if (!sdi || !(devc = sdi->priv))
+       if (!sdi)
                return SR_ERR_ARG;
 
+       devc = sdi->priv;
+
        if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
                return SR_ERR;
 
@@ -777,7 +774,7 @@ SR_PRIV struct sr_dev_driver hameg_hmo_driver_info = {
        .name = "hameg-hmo",
        .longname = "Hameg HMO",
        .api_version = 1,
-       .init = init,
+       .init = std_init,
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,