Changes in uspace/drv/bus/usb/usbmid/usbmid.c [b7fd2a0:58563585] in mainline

File:

• uspace/drv/bus/usb/usbmid/usbmid.c (modified) (6 diffs)

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -51 +51 @@
  * @return Error code.
  */
-static errno_t usb_iface_device_handle(ddf_fun_t *fun, devman_handle_t *handle)
+static int usb_iface_device_handle(ddf_fun_t *fun, devman_handle_t *handle)
 {
         assert(fun);
@@ -61 +61 @@
 
 /** Callback for DDF USB get interface. */
-static errno_t usb_iface_iface_no(ddf_fun_t *fun, int *iface_no)
+static int usb_iface_iface_no(ddf_fun_t *fun, int *iface_no)
 {
         usbmid_interface_t *iface = ddf_fun_data_get(fun);
@@ -83 +83 @@
 };
 
-errno_t usbmid_interface_destroy(usbmid_interface_t *mid_iface)
+int usbmid_interface_destroy(usbmid_interface_t *mid_iface)
 {
         assert(mid_iface);
         assert_link_not_used(&mid_iface->link);
-        const errno_t ret = ddf_fun_unbind(mid_iface->fun);
+        const int ret = ddf_fun_unbind(mid_iface->fun);
         if (ret != EOK) {
                 return ret;
@@ -103 +103 @@
  * @return Error code.
  */
-errno_t usbmid_spawn_interface_child(usb_device_t *parent,
+int usbmid_spawn_interface_child(usb_device_t *parent,
     usbmid_interface_t **iface_ret,
     const usb_standard_device_descriptor_t *device_descriptor,
@@ -110 +110 @@
         ddf_fun_t *child = NULL;
         char *child_name = NULL;
-        errno_t rc;
+        int rc;
 
         /*
@@ -117 +117 @@
          * class name something humanly understandable.
          */
-        int ret = asprintf(&child_name, "%s%hhu",
+        rc = asprintf(&child_name, "%s%hhu",
             usb_str_class(interface_descriptor->interface_class),
             interface_descriptor->interface_number);
-        if (ret < 0) {
+        if (rc < 0) {
                 return ENOMEM;
         }