Changeset 6da6039 in mainline

Timestamp:

2017-08-20T23:53:22Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

ab5a0830

Parents:

3d8a3bd

Message:

Removed old unneeded allocation in add_cmd, cmd should always be non-NULL now.

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (1 diff)
• trb_ring.c (modified) (1 diff)

uspace/drv/bus/usb/xhci/commands.c

@@ -170 +170 @@
 }
 
-static inline int add_cmd(xhci_hc_t *hc, xhci_cmd_t *cmd)
-{
-        if (cmd == NULL) {
-                cmd = xhci_alloc_command();
-                if (cmd == NULL)
-                        return ENOMEM;
-
-                cmd->has_owner = false;
-        }
+static inline void add_cmd(xhci_hc_t *hc, xhci_cmd_t *cmd)
+{
+        assert(cmd);
 
         list_append(&cmd->link, &hc->commands);
         cmd->trb = hc->command_ring.enqueue_trb;
-
-        return EOK;
 }
 

uspace/drv/bus/usb/xhci/trb_ring.c

@@ -310 +310 @@
                 ring->dequeue_trb = segment_begin(ring->dequeue_segment);
         }
-        
-
-        return EOK;
-}
+
+        return EOK;
+}