github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 15:41:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

usb: xhci: adjust xhci_alloc_segments_for_ring() arguments

Browse Source 
The function xhci_alloc_segments_for_ring() currently takes 7 arguments,
5 of which are components of the 'xhci_ring' struct. Refactor the function
to accept a pointer to the 'xhci_ring' struct instead of passing these
components separately.

The change reduces the number of arguments, making the function signature
cleaner and easier to understand.

Signed-off-by: Niklas Neronin <niklas.neronin@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20241106101459.775897-13-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Niklas Neronin 2024-11-06 12:14:38 +02:00 committed by Greg Kroah-Hartman
parent e1b0fa8639
commit 401406a4c7
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -313,44 +313,38 @@ void xhci_initialize_ring_info(struct xhci_ring *ring)
EXPORT_SYMBOL_GPL(xhci_initialize_ring_info);
/* Allocate segments and link them for a ring */
static int xhci_alloc_segments_for_ring(struct xhci_hcd *xhci,
struct xhci_segment **first,
struct xhci_segment **last,
unsigned int num_segs,
enum xhci_ring_type type,
unsigned int max_packet,
gfp_t flags)
static int xhci_alloc_segments_for_ring(struct xhci_hcd *xhci, struct xhci_ring *ring, gfp_t flags)
{
struct xhci_segment *prev;
unsigned int num = 0;
bool chain_links;
chain_links = xhci_link_chain_quirk(xhci, type);
chain_links = xhci_link_chain_quirk(xhci, ring->type);
prev = xhci_segment_alloc(xhci, max_packet, num, flags);
prev = xhci_segment_alloc(xhci, ring->bounce_buf_len, num, flags);
if (!prev)
return -ENOMEM;
num++;
*first = prev;
while (num < num_segs) {
ring->first_seg = prev;
while (num < ring->num_segs) {
struct xhci_segment *next;
next = xhci_segment_alloc(xhci, max_packet, num, flags);
next = xhci_segment_alloc(xhci, ring->bounce_buf_len, num, flags);
if (!next)
goto free_segments;
xhci_link_segments(prev, next, type, chain_links);
xhci_link_segments(prev, next, ring->type, chain_links);
prev = next;
num++;
}
xhci_link_segments(prev, *first, type, chain_links);
*last = prev;
xhci_link_segments(prev, ring->first_seg, ring->type, chain_links);
ring->last_seg = prev;
return 0;
free_segments:
xhci_free_segments_for_ring(xhci, *first);
xhci_free_segments_for_ring(xhci, ring->first_seg);
return -ENOMEM;
}
@ -379,8 +373,7 @@ struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci, unsigned int num_segs,
if (num_segs == 0)
return ring;
ret = xhci_alloc_segments_for_ring(xhci, &ring->first_seg, &ring->last_seg, num_segs,
type, max_packet, flags);
ret = xhci_alloc_segments_for_ring(xhci, ring, flags);
if (ret)
goto fail;
@ -414,23 +407,24 @@ void xhci_free_endpoint_ring(struct xhci_hcd *xhci,
int xhci_ring_expansion(struct xhci_hcd *xhci, struct xhci_ring *ring,
unsigned int num_new_segs, gfp_t flags)
{
struct xhci_segment *first;
struct xhci_segment *last;
int ret;
struct xhci_ring new_ring;
int ret;
ret = xhci_alloc_segments_for_ring(xhci, &first, &last, num_new_segs, ring->type,
ring->bounce_buf_len, flags);
new_ring.num_segs = num_new_segs;
new_ring.bounce_buf_len = ring->bounce_buf_len;
new_ring.type = ring->type;
ret = xhci_alloc_segments_for_ring(xhci, &new_ring, flags);
if (ret)
return -ENOMEM;
if (ring->type == TYPE_STREAM) {
ret = xhci_update_stream_segment_mapping(ring->trb_address_map,
ring, first, flags);
ret = xhci_update_stream_segment_mapping(ring->trb_address_map, ring,
new_ring.first_seg, flags);
if (ret)
goto free_segments;
}
xhci_link_rings(xhci, ring, first, last, num_new_segs);
xhci_link_rings(xhci, ring, new_ring.first_seg, new_ring.last_seg, num_new_segs);
trace_xhci_ring_expansion(ring);
xhci_dbg_trace(xhci, trace_xhci_dbg_ring_expansion,
"ring expansion succeed, now has %d segments",
@ -439,7 +433,7 @@ int xhci_ring_expansion(struct xhci_hcd *xhci, struct xhci_ring *ring,
return 0;
free_segments:
xhci_free_segments_for_ring(xhci, first);
xhci_free_segments_for_ring(xhci, new_ring.first_seg);
return ret;
}