hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Mathias Nyman 2017-12-08 17:59:07 +02:00 committed by Greg Kroah-Hartman
parent 5fd29937de
commit 14d49b7a0b
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/usb/host/xhci-mem.c
View File

@ -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 */ /* Allocate everything needed to free the stream rings later */
stream_info->free_streams_command = 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) if (!stream_info->free_streams_command)
goto cleanup_ctx; goto cleanup_ctx;
@ -1736,6 +1736,26 @@ struct xhci_command *xhci_alloc_command(struct xhci_hcd *xhci,
return command; 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) void xhci_urb_free_priv(struct urb_priv *urb_priv)
{ {
kfree(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_write_64(xhci, val_64, &xhci->op_regs->cmd_ring);
xhci_dbg_cmd_ptrs(xhci); 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) if (!xhci->lpm_command)
goto fail; goto fail;

4
drivers/usb/host/xhci.c
View File

@ -3090,7 +3090,7 @@ static int xhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev,
return -ENOSYS; 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) if (!config_cmd)
return -ENOMEM; return -ENOMEM;
@ -4675,7 +4675,7 @@ static int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev,
return -EINVAL; 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) if (!config_cmd)
return -ENOMEM; return -ENOMEM;

2
drivers/usb/host/xhci.h
View File

@ -1994,6 +1994,8 @@ struct xhci_ring *xhci_stream_id_to_ring(
struct xhci_command *xhci_alloc_command(struct xhci_hcd *xhci, struct xhci_command *xhci_alloc_command(struct xhci_hcd *xhci,
bool allocate_in_ctx, bool allocate_completion, bool allocate_in_ctx, bool allocate_completion,
gfp_t mem_flags); 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_urb_free_priv(struct urb_priv *urb_priv);
void xhci_free_command(struct xhci_hcd *xhci, void xhci_free_command(struct xhci_hcd *xhci,
struct xhci_command *command); struct xhci_command *command);