Skip to content

Commit 3c45a21

Browse files
l1kgregkh
authored andcommitted
xhci: Clean up xhci_{alloc,free}_erst() declarations
xhci_alloc_erst() has global scope even though it's only used in xhci-mem.c. Declare it static. xhci_free_erst() was removed by commit b17a57f ("xhci: Refactor interrupter code for initial multi interrupter support."), but a declaration in xhci.h still remains. Drop it. Signed-off-by: Lukas Wunner <lukas@wunner.de> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Link: https://lore.kernel.org/r/20231019102924.2797346-12-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c087fad commit 3c45a21

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

drivers/usb/host/xhci-mem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1776,7 +1776,7 @@ void xhci_free_command(struct xhci_hcd *xhci,
17761776
kfree(command);
17771777
}
17781778

1779-
int xhci_alloc_erst(struct xhci_hcd *xhci,
1779+
static int xhci_alloc_erst(struct xhci_hcd *xhci,
17801780
struct xhci_ring *evt_ring,
17811781
struct xhci_erst *erst,
17821782
gfp_t flags)

drivers/usb/host/xhci.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2048,13 +2048,8 @@ struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci,
20482048
void xhci_ring_free(struct xhci_hcd *xhci, struct xhci_ring *ring);
20492049
int xhci_ring_expansion(struct xhci_hcd *xhci, struct xhci_ring *ring,
20502050
unsigned int num_trbs, gfp_t flags);
2051-
int xhci_alloc_erst(struct xhci_hcd *xhci,
2052-
struct xhci_ring *evt_ring,
2053-
struct xhci_erst *erst,
2054-
gfp_t flags);
20552051
void xhci_initialize_ring_info(struct xhci_ring *ring,
20562052
unsigned int cycle_state);
2057-
void xhci_free_erst(struct xhci_hcd *xhci, struct xhci_erst *erst);
20582053
void xhci_free_endpoint_ring(struct xhci_hcd *xhci,
20592054
struct xhci_virt_device *virt_dev,
20602055
unsigned int ep_index);

0 commit comments

Comments
 (0)