Changeset 91173333 in mainline for uspace/drv/bus/usb/usbdiag/main.c


Ignore:
Timestamp:
2018-01-13T21:36:13Z (6 years ago)
Author:
Petr Manek <petr.manek@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
edc51615
Parents:
8a0c52a
Message:

usbdev: use centralized joining mechanism, move away from device_removed() callback

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/usbdiag/main.c

    r8a0c52a r91173333  
    7777}
    7878
     79static int device_cleanup(usbdiag_dev_t *diag_dev)
     80{
     81        /* TODO: Join some fibrils? */
     82
     83        /* Free memory. */
     84        usbdiag_dev_destroy(diag_dev);
     85        return EOK;
     86}
     87
    7988static int device_remove(usb_device_t *dev)
    8089{
    … …  
    91100        }
    92101
    93         return EOK;
     102        usb_log_info("Device '%s' removed.", usb_device_get_name(dev));
     103        return device_cleanup(diag_dev);
    94104
    95105err:
    96106        return rc;
    97 }
    98 
    99 static int device_cleanup(usbdiag_dev_t *diag_dev)
    100 {
    101         /* TODO: Join some fibrils? */
    102 
    103         /* Free memory. */
    104         usbdiag_dev_destroy(diag_dev);
    105         return EOK;
    106 }
    107 
    108 static int device_removed(usb_device_t *dev)
    109 {
    110         usb_log_info("Device '%s' removed.", usb_device_get_name(dev));
    111 
    112         usbdiag_dev_t *diag_dev = usb_device_to_usbdiag_dev(dev);
    113         return device_cleanup(diag_dev);
    114107}
    115108
    … …  
    207200        .device_add = device_add,
    208201        .device_remove = device_remove,
    209         .device_removed = device_removed,
    210202        .device_gone = device_gone,
    211203        .function_online = function_online,
Note: See TracChangeset for help on using the changeset viewer.