Skip to content

Commit

Permalink
usb: xhci: remove redundant variable 'erst_size'
Browse files Browse the repository at this point in the history
'erst_size' represents the maximum capacity of entries that ERST can hold,
while 'num_entries' indicates the actual number of entries currently held
in the ERST. These two values are identical because the xhci driver does
not support ERST expansion. Thus, 'erst_size' is removed.

Suggested-by: Mathias Nyman <[email protected]>
Signed-off-by: Niklas Neronin <[email protected]>
Signed-off-by: Mathias Nyman <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Epicurius authored and gregkh committed May 1, 2024
1 parent 5adc1cc commit 7e2bd7d
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/usb/host/xhci-dbgcap.c
Original file line number Diff line number Diff line change
@@ -516,7 +516,7 @@ static int xhci_dbc_mem_init(struct xhci_dbc *dbc, gfp_t flags)
goto string_fail;

/* Setup ERST register: */
writel(dbc->erst.erst_size, &dbc->regs->ersts);
writel(dbc->erst.num_entries, &dbc->regs->ersts);

lo_hi_writeq(dbc->erst.erst_dma_addr, &dbc->regs->erstba);
deq = xhci_trb_virt_to_dma(dbc->ring_evt->deq_seg,
2 changes: 0 additions & 2 deletions drivers/usb/host/xhci.h
Original file line number Diff line number Diff line change
@@ -1376,8 +1376,6 @@ struct xhci_erst {
unsigned int num_entries;
/* xhci->event_ring keeps track of segment dma addresses */
dma_addr_t erst_dma_addr;
/* Num entries the ERST can contain */
unsigned int erst_size;
};

struct xhci_scratchpad {

0 comments on commit 7e2bd7d

Please sign in to comment.