sr: remove unused time/duration fields from datafeed packets

[libsigrok.git] / hwplugin.c

diff --git a/hwplugin.c b/hwplugin.c
index 6b5cd7af6027e16eeb4e0a7da3c6fa8ea162f819..8ec8c30c6008049225b178a04beeeb463ce492ca 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -113,7 +113,7 @@ int sr_init_hwplugins(struct sr_device_plugin *plugin)
        struct sr_device *device;
        char **probe_names;
 
-       g_message("initializing %s plugin", plugin->name);
+       sr_dbg("initializing %s plugin", plugin->name);
        num_devices = plugin->init(NULL);
        for (i = 0; i < num_devices; i++) {
                num_probes = GPOINTER_TO_INT(
@@ -163,7 +163,6 @@ struct sr_device_instance *sr_device_instance_new(int index, int status,
        sdi->model = model ? g_strdup(model) : NULL;
        sdi->version = version ? g_strdup(version) : NULL;
        sdi->priv = NULL;
-       sdi->usb = NULL;
 
        return sdi;
 }
@@ -186,23 +185,7 @@ struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
 
 void sr_device_instance_free(struct sr_device_instance *sdi)
 {
-       switch (sdi->instance_type) {
-#ifdef HAVE_LIBUSB_1_0
-       case SR_USB_INSTANCE:
-               sr_usb_device_instance_free(sdi->usb);
-               break;
-#endif
-       case SR_SERIAL_INSTANCE:
-               sr_serial_device_instance_free(sdi->serial);
-               break;
-       default:
-               /* No specific type, nothing extra to free. */
-               break;
-       }
-
-       if (sdi->priv)
-               g_free(sdi->priv);
-
+       g_free(sdi->priv);
        g_free(sdi->vendor);
        g_free(sdi->model);
        g_free(sdi->version);