LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: s3c-otg: Rename remaining local s3c_*() functions 

The driver is actually for the Designware DWC2 controller.
This patch renames the remaining local s3c_*() functions
to reflect this.

Signed-off-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Marek Vasut 2015-12-04 02:17:40 +01:00
parent f52dd802cc
commit 155e740f73
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/usb/gadget/s3c_udc_otg.c
View File

@ -87,17 +87,17 @@ static dma_addr_t usb_ctrl_dma_addr;
static int dwc2_ep_enable(struct usb_ep *ep, static int dwc2_ep_enable(struct usb_ep *ep,
const struct usb_endpoint_descriptor *); const struct usb_endpoint_descriptor *);
static int dwc2_ep_disable(struct usb_ep *ep); static int dwc2_ep_disable(struct usb_ep *ep);
static struct usb_request *s3c_alloc_request(struct usb_ep *ep, static struct usb_request *dwc2_alloc_request(struct usb_ep *ep,
gfp_t gfp_flags); gfp_t gfp_flags);
static void s3c_free_request(struct usb_ep *ep, struct usb_request *); static void dwc2_free_request(struct usb_ep *ep, struct usb_request *);
static int s3c_queue(struct usb_ep *ep, struct usb_request *, gfp_t gfp_flags); static int dwc2_queue(struct usb_ep *ep, struct usb_request *, gfp_t gfp_flags);
static int s3c_dequeue(struct usb_ep *ep, struct usb_request *); static int dwc2_dequeue(struct usb_ep *ep, struct usb_request *);
static int s3c_fifo_status(struct usb_ep *ep); static int dwc2_fifo_status(struct usb_ep *ep);
static void s3c_fifo_flush(struct usb_ep *ep); static void dwc2_fifo_flush(struct usb_ep *ep);
static void dwc2_ep0_read(struct dwc2_udc *dev); static void dwc2_ep0_read(struct dwc2_udc *dev);
static void dwc2_ep0_kick(struct dwc2_udc *dev, struct dwc2_ep *ep); static void dwc2_ep0_kick(struct dwc2_udc *dev, struct dwc2_ep *ep);
static void s3c_handle_ep0(struct dwc2_udc *dev); static void dwc2_handle_ep0(struct dwc2_udc *dev);
static int dwc2_ep0_write(struct dwc2_udc *dev); static int dwc2_ep0_write(struct dwc2_udc *dev);
static int write_fifo_ep0(struct dwc2_ep *ep, struct dwc2_request *req); 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 done(struct dwc2_ep *ep, struct dwc2_request *req, int status);
@ -128,15 +128,15 @@ static struct usb_ep_ops dwc2_ep_ops = {
.enable = dwc2_ep_enable, .enable = dwc2_ep_enable,
.disable = dwc2_ep_disable, .disable = dwc2_ep_disable,
.alloc_request = s3c_alloc_request, .alloc_request = dwc2_alloc_request,
.free_request = s3c_free_request, .free_request = dwc2_free_request,
.queue = s3c_queue, .queue = dwc2_queue,
.dequeue = s3c_dequeue, .dequeue = dwc2_dequeue,
.set_halt = dwc2_udc_set_halt, .set_halt = dwc2_udc_set_halt,
.fifo_status = s3c_fifo_status, .fifo_status = dwc2_fifo_status,
.fifo_flush = s3c_fifo_flush, .fifo_flush = dwc2_fifo_flush,
}; };
#define create_proc_files() do {} while (0) #define create_proc_files() do {} while (0)
@ -621,7 +621,7 @@ static int dwc2_ep_disable(struct usb_ep *_ep)
return 0; return 0;
} }
static struct usb_request *s3c_alloc_request(struct usb_ep *ep, static struct usb_request *dwc2_alloc_request(struct usb_ep *ep,
gfp_t gfp_flags) gfp_t gfp_flags)
{ {
struct dwc2_request *req; struct dwc2_request *req;
@ -638,7 +638,7 @@ static struct usb_request *s3c_alloc_request(struct usb_ep *ep,
return &req->req; return &req->req;
} }
static void s3c_free_request(struct usb_ep *ep, struct usb_request *_req) static void dwc2_free_request(struct usb_ep *ep, struct usb_request *_req)
{ {
struct dwc2_request *req; struct dwc2_request *req;
@ -650,7 +650,7 @@ static void s3c_free_request(struct usb_ep *ep, struct usb_request *_req)
} }
/* dequeue JUST ONE request */ /* dequeue JUST ONE request */
static int s3c_dequeue(struct usb_ep *_ep, struct usb_request *_req) static int dwc2_dequeue(struct usb_ep *_ep, struct usb_request *_req)
{ {
struct dwc2_ep *ep; struct dwc2_ep *ep;
struct dwc2_request *req; struct dwc2_request *req;
@ -683,7 +683,7 @@ static int s3c_dequeue(struct usb_ep *_ep, struct usb_request *_req)
/* /*
* Return bytes in EP FIFO * Return bytes in EP FIFO
*/ */
static int s3c_fifo_status(struct usb_ep *_ep) static int dwc2_fifo_status(struct usb_ep *_ep)
{ {
int count = 0; int count = 0;
struct dwc2_ep *ep; struct dwc2_ep *ep;
@ -706,7 +706,7 @@ static int s3c_fifo_status(struct usb_ep *_ep)
/* /*
* Flush EP FIFO * Flush EP FIFO
*/ */
static void s3c_fifo_flush(struct usb_ep *_ep) static void dwc2_fifo_flush(struct usb_ep *_ep)
{ {
struct dwc2_ep *ep; struct dwc2_ep *ep;

10
drivers/usb/gadget/s3c_udc_otg_xfer_dma.c
View File

@ -446,7 +446,7 @@ static void process_ep_out_intr(struct dwc2_udc *dev)
CTRL_OUT_EP_SETUP_PHASE_DONE) { CTRL_OUT_EP_SETUP_PHASE_DONE) {
debug_cond(DEBUG_OUT_EP != 0, debug_cond(DEBUG_OUT_EP != 0,
"SETUP packet arrived\n"); "SETUP packet arrived\n");
s3c_handle_ep0(dev); dwc2_handle_ep0(dev);
} }
} else { } else {
if (ep_intr_status & TRANSFER_DONE) if (ep_intr_status & TRANSFER_DONE)
@ -579,7 +579,7 @@ static int dwc2_udc_irq(int irq, void *_dev)
/** Queue one request /** Queue one request
* Kickstart transfer if needed * Kickstart transfer if needed
*/ */
static int s3c_queue(struct usb_ep *_ep, struct usb_request *_req, static int dwc2_queue(struct usb_ep *_ep, struct usb_request *_req,
gfp_t gfp_flags) gfp_t gfp_flags)
{ {
struct dwc2_request *req; struct dwc2_request *req;
@ -718,7 +718,7 @@ static int write_fifo_ep0(struct dwc2_ep *ep, struct dwc2_request *req)
return 0; return 0;
} }
static int s3c_fifo_read(struct dwc2_ep *ep, u32 *cp, int max) static int dwc2_fifo_read(struct dwc2_ep *ep, u32 *cp, int max)
{ {
invalidate_dcache_range((unsigned long)cp, (unsigned long)cp + invalidate_dcache_range((unsigned long)cp, (unsigned long)cp +
ROUND(max, CONFIG_SYS_CACHELINE_SIZE)); ROUND(max, CONFIG_SYS_CACHELINE_SIZE));
@ -1272,7 +1272,7 @@ static void dwc2_ep0_setup(struct dwc2_udc *dev)
nuke(ep, -EPROTO); nuke(ep, -EPROTO);
/* read control req from fifo (8 bytes) */ /* read control req from fifo (8 bytes) */
s3c_fifo_read(ep, (u32 *)usb_ctrl, 8); dwc2_fifo_read(ep, (u32 *)usb_ctrl, 8);
debug_cond(DEBUG_SETUP != 0, debug_cond(DEBUG_SETUP != 0,
"%s: bRequestType = 0x%x(%s), bRequest = 0x%x" "%s: bRequestType = 0x%x(%s), bRequest = 0x%x"
@ -1451,7 +1451,7 @@ static void dwc2_ep0_setup(struct dwc2_udc *dev)
/* /*
* handle ep0 interrupt * handle ep0 interrupt
*/ */
static void s3c_handle_ep0(struct dwc2_udc *dev) static void dwc2_handle_ep0(struct dwc2_udc *dev)
{ {
if (dev->ep0state == WAIT_FOR_SETUP) { if (dev->ep0state == WAIT_FOR_SETUP) {
debug_cond(DEBUG_OUT_EP != 0, debug_cond(DEBUG_OUT_EP != 0,