Commit d3249fa9 authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman

xhci: dbc: Pass dbc pointer to endpoint init and exit functions.

struct xhci_hcd pointer is not needed for dbc endpoint init and exit,
it was only used to get to the dbc structure.
Pass the dbc pointer as a parameter to these functions instead.

No functional changes
This change helps decoupling xhci and DbC
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20200723144530.9992-13-mathias.nyman@linux.intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ed7bffee
...@@ -319,10 +319,9 @@ int dbc_ep_queue(struct dbc_ep *dep, struct dbc_request *req, ...@@ -319,10 +319,9 @@ int dbc_ep_queue(struct dbc_ep *dep, struct dbc_request *req,
return ret; return ret;
} }
static inline void xhci_dbc_do_eps_init(struct xhci_hcd *xhci, bool direction) static inline void xhci_dbc_do_eps_init(struct xhci_dbc *dbc, bool direction)
{ {
struct dbc_ep *dep; struct dbc_ep *dep;
struct xhci_dbc *dbc = xhci->dbc;
dep = &dbc->eps[direction]; dep = &dbc->eps[direction];
dep->dbc = dbc; dep->dbc = dbc;
...@@ -332,16 +331,14 @@ static inline void xhci_dbc_do_eps_init(struct xhci_hcd *xhci, bool direction) ...@@ -332,16 +331,14 @@ static inline void xhci_dbc_do_eps_init(struct xhci_hcd *xhci, bool direction)
INIT_LIST_HEAD(&dep->list_pending); INIT_LIST_HEAD(&dep->list_pending);
} }
static void xhci_dbc_eps_init(struct xhci_hcd *xhci) static void xhci_dbc_eps_init(struct xhci_dbc *dbc)
{ {
xhci_dbc_do_eps_init(xhci, BULK_OUT); xhci_dbc_do_eps_init(dbc, BULK_OUT);
xhci_dbc_do_eps_init(xhci, BULK_IN); xhci_dbc_do_eps_init(dbc, BULK_IN);
} }
static void xhci_dbc_eps_exit(struct xhci_hcd *xhci) static void xhci_dbc_eps_exit(struct xhci_dbc *dbc)
{ {
struct xhci_dbc *dbc = xhci->dbc;
memset(dbc->eps, 0, sizeof(struct dbc_ep) * ARRAY_SIZE(dbc->eps)); memset(dbc->eps, 0, sizeof(struct dbc_ep) * ARRAY_SIZE(dbc->eps));
} }
...@@ -418,7 +415,7 @@ static int xhci_dbc_mem_init(struct xhci_hcd *xhci, gfp_t flags) ...@@ -418,7 +415,7 @@ static int xhci_dbc_mem_init(struct xhci_hcd *xhci, gfp_t flags)
string_length = xhci_dbc_populate_strings(dbc->string); string_length = xhci_dbc_populate_strings(dbc->string);
xhci_dbc_init_contexts(dbc, string_length); xhci_dbc_init_contexts(dbc, string_length);
xhci_dbc_eps_init(xhci); xhci_dbc_eps_init(dbc);
dbc->state = DS_INITIALIZED; dbc->state = DS_INITIALIZED;
return 0; return 0;
...@@ -449,7 +446,7 @@ static void xhci_dbc_mem_cleanup(struct xhci_hcd *xhci) ...@@ -449,7 +446,7 @@ static void xhci_dbc_mem_cleanup(struct xhci_hcd *xhci)
if (!dbc) if (!dbc)
return; return;
xhci_dbc_eps_exit(xhci); xhci_dbc_eps_exit(dbc);
if (dbc->string) { if (dbc->string) {
dma_free_coherent(dbc->dev, dbc->string_size, dma_free_coherent(dbc->dev, dbc->string_size,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment