diff options
author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2015-09-22 09:24:36 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2015-10-01 13:40:22 -0400 |
commit | 5d31a17b389870a8eb215ce7313144eb49c08838 (patch) | |
tree | eacf0d8a3a17cc5923f1b113a88dfa5f7dc791ca | |
parent | 0e7734193a1fead4d966f3b3b64e54ae71b3d356 (diff) |
usb: gadget: amd5536udc: remove forward declaration of udc_basic_init
Rearrange the udc_basic_init function to remove the forward declaration.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r-- | drivers/usb/gadget/udc/amd5536udc.c | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/drivers/usb/gadget/udc/amd5536udc.c b/drivers/usb/gadget/udc/amd5536udc.c index 00ae0692aa67..157bff1ffa64 100644 --- a/drivers/usb/gadget/udc/amd5536udc.c +++ b/drivers/usb/gadget/udc/amd5536udc.c | |||
@@ -65,7 +65,6 @@ | |||
65 | 65 | ||
66 | static void udc_tasklet_disconnect(unsigned long); | 66 | static void udc_tasklet_disconnect(unsigned long); |
67 | static void empty_req_queue(struct udc_ep *); | 67 | static void empty_req_queue(struct udc_ep *); |
68 | static void udc_basic_init(struct udc *dev); | ||
69 | static void udc_setup_endpoints(struct udc *dev); | 68 | static void udc_setup_endpoints(struct udc *dev); |
70 | static void udc_soft_reset(struct udc *dev); | 69 | static void udc_soft_reset(struct udc *dev); |
71 | static struct udc_request *udc_alloc_bna_dummy(struct udc_ep *ep); | 70 | static struct udc_request *udc_alloc_bna_dummy(struct udc_ep *ep); |
@@ -1507,33 +1506,6 @@ static void make_ep_lists(struct udc *dev) | |||
1507 | dev->ep[UDC_EPOUT_IX].fifo_depth = UDC_RXFIFO_SIZE; | 1506 | dev->ep[UDC_EPOUT_IX].fifo_depth = UDC_RXFIFO_SIZE; |
1508 | } | 1507 | } |
1509 | 1508 | ||
1510 | /* init registers at driver load time */ | ||
1511 | static int startup_registers(struct udc *dev) | ||
1512 | { | ||
1513 | u32 tmp; | ||
1514 | |||
1515 | /* init controller by soft reset */ | ||
1516 | udc_soft_reset(dev); | ||
1517 | |||
1518 | /* mask not needed interrupts */ | ||
1519 | udc_mask_unused_interrupts(dev); | ||
1520 | |||
1521 | /* put into initial config */ | ||
1522 | udc_basic_init(dev); | ||
1523 | /* link up all endpoints */ | ||
1524 | udc_setup_endpoints(dev); | ||
1525 | |||
1526 | /* program speed */ | ||
1527 | tmp = readl(&dev->regs->cfg); | ||
1528 | if (use_fullspeed) | ||
1529 | tmp = AMD_ADDBITS(tmp, UDC_DEVCFG_SPD_FS, UDC_DEVCFG_SPD); | ||
1530 | else | ||
1531 | tmp = AMD_ADDBITS(tmp, UDC_DEVCFG_SPD_HS, UDC_DEVCFG_SPD); | ||
1532 | writel(tmp, &dev->regs->cfg); | ||
1533 | |||
1534 | return 0; | ||
1535 | } | ||
1536 | |||
1537 | /* Inits UDC context */ | 1509 | /* Inits UDC context */ |
1538 | static void udc_basic_init(struct udc *dev) | 1510 | static void udc_basic_init(struct udc *dev) |
1539 | { | 1511 | { |
@@ -1572,6 +1544,33 @@ static void udc_basic_init(struct udc *dev) | |||
1572 | dev->data_ep_queued = 0; | 1544 | dev->data_ep_queued = 0; |
1573 | } | 1545 | } |
1574 | 1546 | ||
1547 | /* init registers at driver load time */ | ||
1548 | static int startup_registers(struct udc *dev) | ||
1549 | { | ||
1550 | u32 tmp; | ||
1551 | |||
1552 | /* init controller by soft reset */ | ||
1553 | udc_soft_reset(dev); | ||
1554 | |||
1555 | /* mask not needed interrupts */ | ||
1556 | udc_mask_unused_interrupts(dev); | ||
1557 | |||
1558 | /* put into initial config */ | ||
1559 | udc_basic_init(dev); | ||
1560 | /* link up all endpoints */ | ||
1561 | udc_setup_endpoints(dev); | ||
1562 | |||
1563 | /* program speed */ | ||
1564 | tmp = readl(&dev->regs->cfg); | ||
1565 | if (use_fullspeed) | ||
1566 | tmp = AMD_ADDBITS(tmp, UDC_DEVCFG_SPD_FS, UDC_DEVCFG_SPD); | ||
1567 | else | ||
1568 | tmp = AMD_ADDBITS(tmp, UDC_DEVCFG_SPD_HS, UDC_DEVCFG_SPD); | ||
1569 | writel(tmp, &dev->regs->cfg); | ||
1570 | |||
1571 | return 0; | ||
1572 | } | ||
1573 | |||
1575 | /* Sets initial endpoint parameters */ | 1574 | /* Sets initial endpoint parameters */ |
1576 | static void udc_setup_endpoints(struct udc *dev) | 1575 | static void udc_setup_endpoints(struct udc *dev) |
1577 | { | 1576 | { |