Commit c75955d1 authored by Anjali Menon's avatar Anjali Menon Committed by Greg Kroah-Hartman

staging: emxx_udc: Alligned to match '('

Allignment matched to the open parenthesis to avoid the
check detected by the checkpatch.pl.

CHECK: Alignment should match open parenthesis
Signed-off-by: default avatarAnjali Menon <cse.anjalimenon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d0aaa57d
...@@ -160,7 +160,7 @@ static void _nbu2ss_ep0_complete(struct usb_ep *_ep, struct usb_request *_req) ...@@ -160,7 +160,7 @@ static void _nbu2ss_ep0_complete(struct usb_ep *_ep, struct usb_request *_req)
recipient = (u8)(p_ctrl->bRequestType & USB_RECIP_MASK); recipient = (u8)(p_ctrl->bRequestType & USB_RECIP_MASK);
selector = p_ctrl->wValue; selector = p_ctrl->wValue;
if ((recipient == USB_RECIP_DEVICE) && if ((recipient == USB_RECIP_DEVICE) &&
(selector == USB_DEVICE_TEST_MODE)) { (selector == USB_DEVICE_TEST_MODE)) {
test_mode = (u32)(p_ctrl->wIndex >> 8); test_mode = (u32)(p_ctrl->wIndex >> 8);
_nbu2ss_set_test_mode(udc, test_mode); _nbu2ss_set_test_mode(udc, test_mode);
} }
...@@ -526,10 +526,10 @@ static void _nbu2ss_dma_unmap_single( ...@@ -526,10 +526,10 @@ static void _nbu2ss_dma_unmap_single(
if (req->unaligned) { if (req->unaligned) {
if (direct == USB_DIR_OUT) if (direct == USB_DIR_OUT)
memcpy(req->req.buf, ep->virt_buf, memcpy(req->req.buf, ep->virt_buf,
req->req.actual & 0xfffffffc); req->req.actual & 0xfffffffc);
} else } else
dma_unmap_single(udc->gadget.dev.parent, dma_unmap_single(udc->gadget.dev.parent,
req->req.dma, req->req.length, req->req.dma, req->req.length,
(direct == USB_DIR_IN) (direct == USB_DIR_IN)
? DMA_TO_DEVICE ? DMA_TO_DEVICE
: DMA_FROM_DEVICE); : DMA_FROM_DEVICE);
...@@ -538,7 +538,7 @@ static void _nbu2ss_dma_unmap_single( ...@@ -538,7 +538,7 @@ static void _nbu2ss_dma_unmap_single(
} else { } else {
if (!req->unaligned) if (!req->unaligned)
dma_sync_single_for_cpu(udc->gadget.dev.parent, dma_sync_single_for_cpu(udc->gadget.dev.parent,
req->req.dma, req->req.length, req->req.dma, req->req.length,
(direct == USB_DIR_IN) (direct == USB_DIR_IN)
? DMA_TO_DEVICE ? DMA_TO_DEVICE
: DMA_FROM_DEVICE); : DMA_FROM_DEVICE);
...@@ -1490,7 +1490,7 @@ static inline int _nbu2ss_req_feature(struct nbu2ss_udc *udc, bool bset) ...@@ -1490,7 +1490,7 @@ static inline int _nbu2ss_req_feature(struct nbu2ss_udc *udc, bool bset)
int result = -EOPNOTSUPP; int result = -EOPNOTSUPP;
if ((udc->ctrl.wLength != 0x0000) || if ((udc->ctrl.wLength != 0x0000) ||
(direction != USB_DIR_OUT)) { (direction != USB_DIR_OUT)) {
return -EINVAL; return -EINVAL;
} }
...@@ -1648,7 +1648,7 @@ static int std_req_set_address(struct nbu2ss_udc *udc) ...@@ -1648,7 +1648,7 @@ static int std_req_set_address(struct nbu2ss_udc *udc)
u32 wValue = udc->ctrl.wValue; u32 wValue = udc->ctrl.wValue;
if ((udc->ctrl.bRequestType != 0x00) || if ((udc->ctrl.bRequestType != 0x00) ||
(udc->ctrl.wIndex != 0x0000) || (udc->ctrl.wIndex != 0x0000) ||
(udc->ctrl.wLength != 0x0000)) { (udc->ctrl.wLength != 0x0000)) {
return -EINVAL; return -EINVAL;
} }
...@@ -1670,7 +1670,7 @@ static int std_req_set_configuration(struct nbu2ss_udc *udc) ...@@ -1670,7 +1670,7 @@ static int std_req_set_configuration(struct nbu2ss_udc *udc)
u32 ConfigValue = (u32)(udc->ctrl.wValue & 0x00ff); u32 ConfigValue = (u32)(udc->ctrl.wValue & 0x00ff);
if ((udc->ctrl.wIndex != 0x0000) || if ((udc->ctrl.wIndex != 0x0000) ||
(udc->ctrl.wLength != 0x0000) || (udc->ctrl.wLength != 0x0000) ||
(udc->ctrl.bRequestType != 0x00)) { (udc->ctrl.bRequestType != 0x00)) {
return -EINVAL; return -EINVAL;
} }
...@@ -1949,7 +1949,7 @@ static void _nbu2ss_ep_done( ...@@ -1949,7 +1949,7 @@ static void _nbu2ss_ep_done(
#ifdef USE_DMA #ifdef USE_DMA
if ((ep->direct == USB_DIR_OUT) && (ep->epnum > 0) && if ((ep->direct == USB_DIR_OUT) && (ep->epnum > 0) &&
(req->req.dma != 0)) (req->req.dma != 0))
_nbu2ss_dma_unmap_single(udc, ep, req, USB_DIR_OUT); _nbu2ss_dma_unmap_single(udc, ep, req, USB_DIR_OUT);
#endif #endif
...@@ -2277,7 +2277,7 @@ static int _nbu2ss_enable_controller(struct nbu2ss_udc *udc) ...@@ -2277,7 +2277,7 @@ static int _nbu2ss_enable_controller(struct nbu2ss_udc *udc)
_nbu2ss_writel(&udc->p_regs->AHBSCTR, WAIT_MODE); _nbu2ss_writel(&udc->p_regs->AHBSCTR, WAIT_MODE);
_nbu2ss_writel(&udc->p_regs->AHBMCTR, _nbu2ss_writel(&udc->p_regs->AHBMCTR,
HBUSREQ_MODE | HTRANS_MODE | WBURST_TYPE); HBUSREQ_MODE | HTRANS_MODE | WBURST_TYPE);
while (!(_nbu2ss_readl(&udc->p_regs->EPCTR) & PLL_LOCK)) { while (!(_nbu2ss_readl(&udc->p_regs->EPCTR) & PLL_LOCK)) {
waitcnt++; waitcnt++;
...@@ -2701,7 +2701,7 @@ static int nbu2ss_ep_queue( ...@@ -2701,7 +2701,7 @@ static int nbu2ss_ep_queue(
if (unlikely(!udc->driver)) { if (unlikely(!udc->driver)) {
dev_err(udc->dev, "%s, bogus device state %p\n", __func__, dev_err(udc->dev, "%s, bogus device state %p\n", __func__,
udc->driver); udc->driver);
return -ESHUTDOWN; return -ESHUTDOWN;
} }
...@@ -2721,12 +2721,12 @@ static int nbu2ss_ep_queue( ...@@ -2721,12 +2721,12 @@ static int nbu2ss_ep_queue(
if (ep->epnum > 0) { if (ep->epnum > 0) {
if (ep->direct == USB_DIR_IN) if (ep->direct == USB_DIR_IN)
memcpy(ep->virt_buf, req->req.buf, memcpy(ep->virt_buf, req->req.buf,
req->req.length); req->req.length);
} }
} }
if ((ep->epnum > 0) && (ep->direct == USB_DIR_OUT) && if ((ep->epnum > 0) && (ep->direct == USB_DIR_OUT) &&
(req->req.dma != 0)) (req->req.dma != 0))
_nbu2ss_dma_map_single(udc, ep, req, USB_DIR_OUT); _nbu2ss_dma_map_single(udc, ep, req, USB_DIR_OUT);
#endif #endif
...@@ -2741,12 +2741,12 @@ static int nbu2ss_ep_queue( ...@@ -2741,12 +2741,12 @@ static int nbu2ss_ep_queue(
result = _nbu2ss_start_transfer(udc, ep, req, FALSE); result = _nbu2ss_start_transfer(udc, ep, req, FALSE);
if (result < 0) { if (result < 0) {
dev_err(udc->dev, " *** %s, result = %d\n", __func__, dev_err(udc->dev, " *** %s, result = %d\n", __func__,
result); result);
list_del(&req->queue); list_del(&req->queue);
} else if ((ep->epnum > 0) && (ep->direct == USB_DIR_OUT)) { } else if ((ep->epnum > 0) && (ep->direct == USB_DIR_OUT)) {
#ifdef USE_DMA #ifdef USE_DMA
if (req->req.length < 4 && if (req->req.length < 4 &&
req->req.length == req->req.actual) req->req.length == req->req.actual)
#else #else
if (req->req.length == req->req.actual) if (req->req.length == req->req.actual)
#endif #endif
...@@ -3026,7 +3026,7 @@ static int nbu2ss_gad_wakeup(struct usb_gadget *pgadget) ...@@ -3026,7 +3026,7 @@ static int nbu2ss_gad_wakeup(struct usb_gadget *pgadget)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static int nbu2ss_gad_set_selfpowered(struct usb_gadget *pgadget, static int nbu2ss_gad_set_selfpowered(struct usb_gadget *pgadget,
int is_selfpowered) int is_selfpowered)
{ {
struct nbu2ss_udc *udc; struct nbu2ss_udc *udc;
unsigned long flags; unsigned long flags;
...@@ -3180,7 +3180,8 @@ static void __init nbu2ss_drv_ep_init(struct nbu2ss_udc *udc) ...@@ -3180,7 +3180,8 @@ static void __init nbu2ss_drv_ep_init(struct nbu2ss_udc *udc)
ep->ep.ops = &nbu2ss_ep_ops; ep->ep.ops = &nbu2ss_ep_ops;
usb_ep_set_maxpacket_limit(&ep->ep, usb_ep_set_maxpacket_limit(&ep->ep,
i == 0 ? EP0_PACKETSIZE : EP_PACKETSIZE); i == 0 ? EP0_PACKETSIZE
: EP_PACKETSIZE);
list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list); list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list);
INIT_LIST_HEAD(&ep->queue); INIT_LIST_HEAD(&ep->queue);
...@@ -3273,10 +3274,7 @@ static int nbu2ss_drv_probe(struct platform_device *pdev) ...@@ -3273,10 +3274,7 @@ static int nbu2ss_drv_probe(struct platform_device *pdev)
/* VBUS Interrupt */ /* VBUS Interrupt */
irq_set_irq_type(INT_VBUS, IRQ_TYPE_EDGE_BOTH); irq_set_irq_type(INT_VBUS, IRQ_TYPE_EDGE_BOTH);
status = request_irq(INT_VBUS, status = request_irq(INT_VBUS,
_nbu2ss_vbus_irq, _nbu2ss_vbus_irq, IRQF_SHARED, driver_name, udc);
IRQF_SHARED,
driver_name,
udc);
if (status != 0) { if (status != 0) {
dev_err(udc->dev, "request_irq(INT_VBUS) failed\n"); dev_err(udc->dev, "request_irq(INT_VBUS) failed\n");
......
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