Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: s3c-otg: Rename struct s3c_request

Browse Source 
The driver is actually for the Designware DWC2 controller.
This patch renames struct s3c_request to reflect this.

Signed-off-by: Marek Vasut <marex@denx.de>
master
Marek Vasut 10 years ago
parent 627d929826
commit c056c52bbd
3 changed files with 28 additions and 28 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      drivers/usb/gadget/s3c_udc_otg.c
  2. 2
      drivers/usb/gadget/s3c_udc_otg_priv.h
  3. 36
      drivers/usb/gadget/s3c_udc_otg_xfer_dma.c

18
drivers/usb/gadget/s3c_udc_otg.c
Unescape View File

@ -99,8 +99,8 @@ static void s3c_ep0_read(struct dwc2_udc *dev);
static void s3c_ep0_kick(struct dwc2_udc *dev, struct dwc2_ep *ep);
static void s3c_handle_ep0(struct dwc2_udc *dev);
static int s3c_ep0_write(struct dwc2_udc *dev);
static int write_fifo_ep0(struct dwc2_ep *ep, struct s3c_request *req);
static void done(struct dwc2_ep *ep, struct s3c_request *req, int status);
static int write_fifo_ep0(struct dwc2_ep *ep, struct dwc2_request *req);
static void done(struct dwc2_ep *ep, struct dwc2_request *req, int status);
static void stop_activity(struct dwc2_udc *dev,
struct usb_gadget_driver *driver);
static int udc_enable(struct dwc2_udc *dev);
@ -305,7 +305,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
/*
* done - retire a request; caller blocked irqs
*/
static void done(struct dwc2_ep *ep, struct s3c_request *req, int status)
static void done(struct dwc2_ep *ep, struct dwc2_request *req, int status)
{
unsigned int stopped = ep->stopped;
@ -358,13 +358,13 @@ static void done(struct dwc2_ep *ep, struct s3c_request *req, int status)
*/
static void nuke(struct dwc2_ep *ep, int status)
{
struct s3c_request *req;
struct dwc2_request *req;
debug("%s: %s %p\n", __func__, ep->ep.name, ep);
/* called with irqs blocked */
while (!list_empty(&ep->queue)) {
req = list_entry(ep->queue.next, struct s3c_request, queue);
req = list_entry(ep->queue.next, struct dwc2_request, queue);
done(ep, req, status);
}
}
@ -624,7 +624,7 @@ static int s3c_ep_disable(struct usb_ep *_ep)
static struct usb_request *s3c_alloc_request(struct usb_ep *ep,
gfp_t gfp_flags)
{
struct s3c_request *req;
struct dwc2_request *req;
debug("%s: %s %p\n", __func__, ep->name, ep);
@ -640,11 +640,11 @@ static struct usb_request *s3c_alloc_request(struct usb_ep *ep,
static void s3c_free_request(struct usb_ep *ep, struct usb_request *_req)
{
struct s3c_request *req;
struct dwc2_request *req;
debug("%s: %p\n", __func__, ep);
req = container_of(_req, struct s3c_request, req);
req = container_of(_req, struct dwc2_request, req);
WARN_ON(!list_empty(&req->queue));
kfree(req);
}
@ -653,7 +653,7 @@ static void s3c_free_request(struct usb_ep *ep, struct usb_request *_req)
static int s3c_dequeue(struct usb_ep *_ep, struct usb_request *_req)
{
struct dwc2_ep *ep;
struct s3c_request *req;
struct dwc2_request *req;
unsigned long flags = 0;
debug("%s: %p\n", __func__, _ep);

2
drivers/usb/gadget/s3c_udc_otg_priv.h
Unescape View File

@ -69,7 +69,7 @@ struct dwc2_ep {
int fifo_num;
};
struct s3c_request {
struct dwc2_request {
struct usb_request req;
struct list_head queue;
};

36
drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
Unescape View File

@ -90,7 +90,7 @@ static inline void s3c_ep0_complete_out(void)
}
static int setdma_rx(struct dwc2_ep *ep, struct s3c_request *req)
static int setdma_rx(struct dwc2_ep *ep, struct dwc2_request *req)
{
u32 *buf, ctrl;
u32 length, pktcnt;
@ -128,7 +128,7 @@ static int setdma_rx(struct dwc2_ep *ep, struct s3c_request *req)
}
int setdma_tx(struct dwc2_ep *ep, struct s3c_request *req)
int setdma_tx(struct dwc2_ep *ep, struct dwc2_request *req)
{
u32 *buf, ctrl = 0;
u32 length, pktcnt;
@ -189,7 +189,7 @@ int setdma_tx(struct dwc2_ep *ep, struct s3c_request *req)
static void complete_rx(struct dwc2_udc *dev, u8 ep_num)
{
struct dwc2_ep *ep = &dev->ep[ep_num];
struct s3c_request *req = NULL;
struct dwc2_request *req = NULL;
u32 ep_tsr = 0, xfer_size = 0, is_short = 0;
if (list_empty(&ep->queue)) {
@ -200,7 +200,7 @@ static void complete_rx(struct dwc2_udc *dev, u8 ep_num)
}
req = list_entry(ep->queue.next, struct s3c_request, queue);
req = list_entry(ep->queue.next, struct dwc2_request, queue);
ep_tsr = readl(&reg->out_endp[ep_num].doeptsiz);
if (ep_num == EP0_CON)
@ -248,7 +248,7 @@ static void complete_rx(struct dwc2_udc *dev, u8 ep_num)
if (!list_empty(&ep->queue)) {
req = list_entry(ep->queue.next,
struct s3c_request, queue);
struct dwc2_request, queue);
debug_cond(DEBUG_OUT_EP != 0,
"%s: Next Rx request start...\n",
__func__);
@ -262,7 +262,7 @@ static void complete_rx(struct dwc2_udc *dev, u8 ep_num)
static void complete_tx(struct dwc2_udc *dev, u8 ep_num)
{
struct dwc2_ep *ep = &dev->ep[ep_num];
struct s3c_request *req;
struct dwc2_request *req;
u32 ep_tsr = 0, xfer_size = 0, is_short = 0;
u32 last;
@ -280,7 +280,7 @@ static void complete_tx(struct dwc2_udc *dev, u8 ep_num)
}
req = list_entry(ep->queue.next, struct s3c_request, queue);
req = list_entry(ep->queue.next, struct dwc2_request, queue);
ep_tsr = readl(&reg->in_endp[ep_num].dieptsiz);
@ -328,7 +328,7 @@ static void complete_tx(struct dwc2_udc *dev, u8 ep_num)
done(ep, req, 0);
if (!list_empty(&ep->queue)) {
req = list_entry(ep->queue.next, struct s3c_request, queue);
req = list_entry(ep->queue.next, struct dwc2_request, queue);
debug_cond(DEBUG_IN_EP,
"%s: Next Tx request start...\n", __func__);
setdma_tx(ep, req);
@ -338,13 +338,13 @@ static void complete_tx(struct dwc2_udc *dev, u8 ep_num)
static inline void s3c_udc_check_tx_queue(struct dwc2_udc *dev, u8 ep_num)
{
struct dwc2_ep *ep = &dev->ep[ep_num];
struct s3c_request *req;
struct dwc2_request *req;
debug_cond(DEBUG_IN_EP,
"%s: Check queue, ep_num = %d\n", __func__, ep_num);
if (!list_empty(&ep->queue)) {
req = list_entry(ep->queue.next, struct s3c_request, queue);
req = list_entry(ep->queue.next, struct dwc2_request, queue);
debug_cond(DEBUG_IN_EP,
"%s: Next Tx request(0x%p) start...\n",
__func__, req);
@ -582,13 +582,13 @@ static int s3c_udc_irq(int irq, void *_dev)
static int s3c_queue(struct usb_ep *_ep, struct usb_request *_req,
gfp_t gfp_flags)
{
struct s3c_request *req;
struct dwc2_request *req;
struct dwc2_ep *ep;
struct dwc2_udc *dev;
unsigned long flags = 0;
u32 ep_num, gintsts;
req = container_of(_req, struct s3c_request, req);
req = container_of(_req, struct dwc2_request, req);
if (unlikely(!_req || !_req->complete || !_req->buf
|| !list_empty(&req->queue))) {
@ -680,7 +680,7 @@ static int s3c_queue(struct usb_ep *_ep, struct usb_request *_req,
/****************************************************************/
/* return: 0 = still running, 1 = completed, negative = errno */
static int write_fifo_ep0(struct dwc2_ep *ep, struct s3c_request *req)
static int write_fifo_ep0(struct dwc2_ep *ep, struct dwc2_request *req)
{
u32 max;
unsigned count;
@ -781,11 +781,11 @@ static inline void s3c_udc_ep0_set_stall(struct dwc2_ep *ep)
static void s3c_ep0_read(struct dwc2_udc *dev)
{
struct s3c_request *req;
struct dwc2_request *req;
struct dwc2_ep *ep = &dev->ep[0];
if (!list_empty(&ep->queue)) {
req = list_entry(ep->queue.next, struct s3c_request, queue);
req = list_entry(ep->queue.next, struct dwc2_request, queue);
} else {
debug("%s: ---> BUG\n", __func__);
@ -818,14 +818,14 @@ static void s3c_ep0_read(struct dwc2_udc *dev)
*/
static int s3c_ep0_write(struct dwc2_udc *dev)
{
struct s3c_request *req;
struct dwc2_request *req;
struct dwc2_ep *ep = &dev->ep[0];
int ret, need_zlp = 0;
if (list_empty(&ep->queue))
req = 0;
else
req = list_entry(ep->queue.next, struct s3c_request, queue);
req = list_entry(ep->queue.next, struct dwc2_request, queue);
if (!req) {
debug_cond(DEBUG_EP0 != 0, "%s: NULL REQ\n", __func__);
@ -1050,7 +1050,7 @@ static int s3c_udc_set_halt(struct usb_ep *_ep, int value)
if (value && ep_is_in(ep) && !list_empty(&ep->queue)) {
debug("%s: %s queue not empty, req = %p\n",
__func__, ep->ep.name,
list_entry(ep->queue.next, struct s3c_request, queue));
list_entry(ep->queue.next, struct dwc2_request, queue));
return -EAGAIN;
}

Write Preview
Loading…
Cancel
Save