UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

xhci: dbc: Use dbc structure in the request completion instead of xhci_hcd 

The dbc request completion callback doesn't need a xhci_hcd pointer.
The only user of the xhci_hcd pointer in dbgtty request callback was
the xhci_warn() function. Change it to dev_warn() instead.

While changing the callback function parameter to dbc in struct
xhci_requeset, move the struct xhci_request declaraion down a bit in the
header file to avoid compiler warinings

No functional changes
This change helps decoupling xhci and DbC

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20200723144530.9992-18-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mathias Nyman 2020-07-23 17:45:20 +03:00 committed by Greg Kroah-Hartman
parent 91aaf97471
commit f39f3afdf9
3 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usb/host/xhci-dbgcap.c
View File

@ -114,8 +114,7 @@ static void xhci_dbc_giveback(struct dbc_request *req, int status)
{
struct dbc_ep *dep = req->dep;
struct xhci_dbc *dbc = dep->dbc;
struct xhci_hcd *xhci = dbc->xhci;
struct device *dev = xhci_to_hcd(dbc->xhci)->self.sysdev;
struct device *dev = dbc->dev;
list_del_init(&req->list_pending);
req->trb_dma = 0;
@ -133,7 +132,7 @@ static void xhci_dbc_giveback(struct dbc_request *req, int status)
/* Give back the transfer request: */
spin_unlock(&dbc->lock);
req->complete(xhci, req);
req->complete(dbc, req);
spin_lock(&dbc->lock);
}

34
drivers/usb/host/xhci-dbgcap.h
View File

@ -84,23 +84,6 @@ enum dbc_state {
DS_STALLED,
};
struct dbc_request {
void *buf;
unsigned int length;
dma_addr_t dma;
void (*complete)(struct xhci_hcd *xhci,
struct dbc_request *req);
struct list_head list_pool;
int status;
unsigned int actual;
struct dbc_ep *dep;
struct list_head list_pending;
dma_addr_t trb_dma;
union xhci_trb *trb;
unsigned direction:1;
};
struct dbc_ep {
struct xhci_dbc *dbc;
struct list_head list_pending;
@ -154,6 +137,23 @@ struct xhci_dbc {
struct dbc_port port;
};
struct dbc_request {
void *buf;
unsigned int length;
dma_addr_t dma;
void (*complete)(struct xhci_dbc *dbc,
struct dbc_request *req);
struct list_head list_pool;
int status;
unsigned int actual;
struct dbc_ep *dep;
struct list_head list_pending;
dma_addr_t trb_dma;
union xhci_trb *trb;
unsigned direction:1;
};
#define dbc_bulkout_ctx(d) \
((struct xhci_ep_ctx *)((d)->ctx->bytes + DBC_CONTEXT_SIZE))
#define dbc_bulkin_ctx(d) \

10
drivers/usb/host/xhci-dbgtty.c
View File

@ -91,10 +91,9 @@ static void dbc_start_rx(struct dbc_port *port)
}
static void
dbc_read_complete(struct xhci_hcd *xhci, struct dbc_request *req)
dbc_read_complete(struct xhci_dbc *dbc, struct dbc_request *req)
{
unsigned long flags;
struct xhci_dbc *dbc = xhci->dbc;
struct dbc_port *port = &dbc->port;
spin_lock_irqsave(&port->port_lock, flags);
@ -103,10 +102,9 @@ dbc_read_complete(struct xhci_hcd *xhci, struct dbc_request *req)
spin_unlock_irqrestore(&port->port_lock, flags);
}
static void dbc_write_complete(struct xhci_hcd *xhci, struct dbc_request *req)
static void dbc_write_complete(struct xhci_dbc *dbc, struct dbc_request *req)
{
unsigned long flags;
struct xhci_dbc *dbc = xhci->dbc;
struct dbc_port *port = &dbc->port;
spin_lock_irqsave(&port->port_lock, flags);
@ -118,7 +116,7 @@ static void dbc_write_complete(struct xhci_hcd *xhci, struct dbc_request *req)
case -ESHUTDOWN:
break;
default:
xhci_warn(xhci, "unexpected write complete status %d\n",
dev_warn(dbc->dev, "unexpected write complete status %d\n",
req->status);
break;
}
@ -133,7 +131,7 @@ static void xhci_dbc_free_req(struct dbc_ep *dep, struct dbc_request *req)
static int
xhci_dbc_alloc_requests(struct dbc_ep *dep, struct list_head *head,
void (*fn)(struct xhci_hcd *, struct dbc_request *))
void (*fn)(struct xhci_dbc *, struct dbc_request *))
{
int i;
struct dbc_request *req;