aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shishkin <alexander.shishkin@linux.intel.com>2012-05-08 16:28:57 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-09 17:51:24 -0400
commit1155a7b8315bc60e43ee67e2e0e32e536f3a2a93 (patch)
tree10480316afa3d944265ee970682bcd7544302a94
parentdf767b71e5816692134d59c0c17e0f77cd73333d (diff)
usb: gadget: ci13xxx: drop needless parens
Small and self-evident cleanup. Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/gadget/ci13xxx_udc.c8
-rw-r--r--drivers/usb/gadget/ci13xxx_udc.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c
index 3a453393735c..992ce1145d26 100644
--- a/drivers/usb/gadget/ci13xxx_udc.c
+++ b/drivers/usb/gadget/ci13xxx_udc.c
@@ -1760,14 +1760,14 @@ __acquires(mEp->lock)
1760 1760
1761 if ((setup->bRequestType & USB_RECIP_MASK) == USB_RECIP_DEVICE) { 1761 if ((setup->bRequestType & USB_RECIP_MASK) == USB_RECIP_DEVICE) {
1762 /* Assume that device is bus powered for now. */ 1762 /* Assume that device is bus powered for now. */
1763 *((u16 *)req->buf) = _udc->remote_wakeup << 1; 1763 *(u16 *)req->buf = _udc->remote_wakeup << 1;
1764 retval = 0; 1764 retval = 0;
1765 } else if ((setup->bRequestType & USB_RECIP_MASK) \ 1765 } else if ((setup->bRequestType & USB_RECIP_MASK) \
1766 == USB_RECIP_ENDPOINT) { 1766 == USB_RECIP_ENDPOINT) {
1767 dir = (le16_to_cpu(setup->wIndex) & USB_ENDPOINT_DIR_MASK) ? 1767 dir = (le16_to_cpu(setup->wIndex) & USB_ENDPOINT_DIR_MASK) ?
1768 TX : RX; 1768 TX : RX;
1769 num = le16_to_cpu(setup->wIndex) & USB_ENDPOINT_NUMBER_MASK; 1769 num = le16_to_cpu(setup->wIndex) & USB_ENDPOINT_NUMBER_MASK;
1770 *((u16 *)req->buf) = hw_ep_get_halt(num, dir); 1770 *(u16 *)req->buf = hw_ep_get_halt(num, dir);
1771 } 1771 }
1772 /* else do nothing; reserved for future use */ 1772 /* else do nothing; reserved for future use */
1773 1773
@@ -2284,8 +2284,8 @@ static int ep_queue(struct usb_ep *ep, struct usb_request *req,
2284 goto done; 2284 goto done;
2285 } 2285 }
2286 2286
2287 if (req->length > (4 * CI13XXX_PAGE_SIZE)) { 2287 if (req->length > 4 * CI13XXX_PAGE_SIZE) {
2288 req->length = (4 * CI13XXX_PAGE_SIZE); 2288 req->length = 4 * CI13XXX_PAGE_SIZE;
2289 retval = -EMSGSIZE; 2289 retval = -EMSGSIZE;
2290 warn("request length truncated"); 2290 warn("request length truncated");
2291 } 2291 }
diff --git a/drivers/usb/gadget/ci13xxx_udc.h b/drivers/usb/gadget/ci13xxx_udc.h
index 66f41a34c765..926cd68aed41 100644
--- a/drivers/usb/gadget/ci13xxx_udc.h
+++ b/drivers/usb/gadget/ci13xxx_udc.h
@@ -20,10 +20,10 @@
20 * DEFINE 20 * DEFINE
21 *****************************************************************************/ 21 *****************************************************************************/
22#define CI13XXX_PAGE_SIZE 4096ul /* page size for TD's */ 22#define CI13XXX_PAGE_SIZE 4096ul /* page size for TD's */
23#define ENDPT_MAX (32) 23#define ENDPT_MAX 32
24#define CTRL_PAYLOAD_MAX (64) 24#define CTRL_PAYLOAD_MAX 64
25#define RX (0) /* similar to USB_DIR_OUT but can be used as an index */ 25#define RX 0 /* similar to USB_DIR_OUT but can be used as an index */
26#define TX (1) /* similar to USB_DIR_IN but can be used as an index */ 26#define TX 1 /* similar to USB_DIR_IN but can be used as an index */
27 27
28/****************************************************************************** 28/******************************************************************************
29 * STRUCTURES 29 * STRUCTURES