Changeset 7aaed09 in mainline for uspace/drv/bus/usb/usbflbk/main.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/drv/bus/usb/usbflbk/main.c (modified) (2 diffs)

uspace/drv/bus/usb/usbflbk/main.c

@@ -74 +74 @@
 }
 
-/** Callback when new device is about to be removed.
- *
- * @param dev Representation of a generic DDF device.
- * @return Error code.
- */
-static int usbfallback_device_remove(usb_device_t *dev)
-{
-        return EOK;
-}
-
 /** Callback when new device is removed and recognized as gone by DDF.
  *
@@ -107 +97 @@
 static const usb_driver_ops_t usbfallback_driver_ops = {
         .device_add = usbfallback_device_add,
-        .device_rem = usbfallback_device_remove,
+        .device_rem = usbfallback_device_gone,
         .device_gone = usbfallback_device_gone,
 };