xhci: add helper to allocate command with input context

Add a xhci_alloc_command_with_ctx() helper to get rid of
one of the boolean parameters telling if a context should
be allocated with the command.

No functional changes, improves core readability

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index e1fba4688509df32d0aee83be2f53abbf65f37b5..7ab4020336f37d45767645d3558f3871dd39ef38 100644 (file)
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -650,7 +650,7 @@ struct xhci_stream_info *xhci_alloc_stream_info(struct xhci_hcd *xhci,
 
        /* Allocate everything needed to free the stream rings later */
        stream_info->free_streams_command =
-               xhci_alloc_command(xhci, true, true, mem_flags);
+               xhci_alloc_command_with_ctx(xhci, true, mem_flags);
        if (!stream_info->free_streams_command)
                goto cleanup_ctx;
 
@@ -1736,6 +1736,26 @@ struct xhci_command *xhci_alloc_command(struct xhci_hcd *xhci,
        return command;
 }
 
+struct xhci_command *xhci_alloc_command_with_ctx(struct xhci_hcd *xhci,
+               bool allocate_completion, gfp_t mem_flags)
+{
+       struct xhci_command *command;
+
+       command = xhci_alloc_command(xhci, false, allocate_completion,
+                                    mem_flags);
+       if (!command)
+               return NULL;
+
+       command->in_ctx = xhci_alloc_container_ctx(xhci, XHCI_CTX_TYPE_INPUT,
+                                                  mem_flags);
+       if (!command->in_ctx) {
+               kfree(command->completion);
+               kfree(command);
+               return NULL;
+       }
+       return command;
+}
+
 void xhci_urb_free_priv(struct urb_priv *urb_priv)
 {
        kfree(urb_priv);
@@ -2409,7 +2429,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
        xhci_write_64(xhci, val_64, &xhci->op_regs->cmd_ring);
        xhci_dbg_cmd_ptrs(xhci);
 
-       xhci->lpm_command = xhci_alloc_command(xhci, true, true, flags);
+       xhci->lpm_command = xhci_alloc_command_with_ctx(xhci, true, flags);
        if (!xhci->lpm_command)
                goto fail;
 

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 89ad7c057454a19f03ad80eb17c9d6f144c6c05a..5d99a6077d574e6ffbb4f8be7818730718e13417 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3090,7 +3090,7 @@ static int xhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev,
                return -ENOSYS;
        }
 
-       config_cmd = xhci_alloc_command(xhci, true, true, mem_flags);
+       config_cmd = xhci_alloc_command_with_ctx(xhci, true, mem_flags);
        if (!config_cmd)
                return -ENOMEM;
 
@@ -4675,7 +4675,7 @@ static int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev,
                return -EINVAL;
        }
 
-       config_cmd = xhci_alloc_command(xhci, true, true, mem_flags);
+       config_cmd = xhci_alloc_command_with_ctx(xhci, true, mem_flags);
        if (!config_cmd)
                return -ENOMEM;
 

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 99a014a920d30fb5d8519033b4312e5c8bb55ace..147f1a0cb9335f9dc746e16a1f6c39e6e5c55f53 100644 (file)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1994,6 +1994,8 @@ struct xhci_ring *xhci_stream_id_to_ring(
 struct xhci_command *xhci_alloc_command(struct xhci_hcd *xhci,
                bool allocate_in_ctx, bool allocate_completion,
                gfp_t mem_flags);
+struct xhci_command *xhci_alloc_command_with_ctx(struct xhci_hcd *xhci,
+               bool allocate_completion, gfp_t mem_flags);
 void xhci_urb_free_priv(struct urb_priv *urb_priv);
 void xhci_free_command(struct xhci_hcd *xhci,
                struct xhci_command *command);