Drop unnecessary struct sr_dev_driver forward declarations

[libsigrok.git] / src / hardware / hantek-dso / dso.c

diff --git a/src/hardware/hantek-dso/dso.c b/src/hardware/hantek-dso/dso.c
index 27ef63c1e864b35385973c9750237bbaa3f62ef7..06037e29278e775ad5d13e4e8ec0811709d6d25d 100644 (file)
--- a/src/hardware/hantek-dso/dso.c
+++ b/src/hardware/hantek-dso/dso.c
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include <glib.h>
 #include <libusb.h>
@@ -28,8 +29,6 @@
 
 #define NUM_CHANNELS 2
 
-extern struct sr_dev_driver hantek_dso_driver_info;
-
 static int send_begin(const struct sr_dev_inst *sdi)
 {
        struct sr_usb_dev_inst *usb;
@@ -75,8 +74,7 @@ static int dso_getmps(libusb_device *dev)
        const struct libusb_interface_descriptor *intf_dsc;
        int mps;
 
-       if (libusb_get_device_descriptor(dev, &des) != 0)
-               return 0;
+       libusb_get_device_descriptor(dev, &des);
 
        if (des.bNumConfigurations != 1)
                return 0;
@@ -111,7 +109,7 @@ err:
 SR_PRIV int dso_open(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
-       struct drv_context *drvc = hantek_dso_driver_info.context;
+       struct drv_context *drvc = sdi->driver->context;
        struct sr_usb_dev_inst *usb;
        struct libusb_device_descriptor des;
        libusb_device **devlist;
@@ -127,11 +125,7 @@ SR_PRIV int dso_open(struct sr_dev_inst *sdi)
 
        libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
        for (i = 0; devlist[i]; i++) {
-               if ((err = libusb_get_device_descriptor(devlist[i], &des))) {
-                       sr_err("Failed to get device descriptor: %s.",
-                              libusb_error_name(err));
-                       continue;
-               }
+               libusb_get_device_descriptor(devlist[i], &des);
 
                if (des.idVendor != devc->profile->fw_vid
                    || des.idProduct != devc->profile->fw_pid)