aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@vmware.com>2011-03-20 05:15:17 -0400
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2011-04-13 19:19:46 -0400
commit5a6c2f3ff039154872ce597952f8b8900ea0d732 (patch)
treeec159272a5031ac9baa7c98dcbb09ca58b96050a /drivers/usb/host
parent2868a2b1ba8f9c7f6c4170519ebb6c62934df70e (diff)
USB: xhci - fix unsafe macro definitions
Macro arguments used in expressions need to be enclosed in parenthesis to avoid unpleasant surprises. This should be queued for kernels back to 2.6.31 Signed-off-by: Dmitry Torokhov <dtor@vmware.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Cc: stable@kernel.org
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/xhci.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 07e263063e37..91b1a237c11e 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -232,7 +232,7 @@ struct xhci_op_regs {
232 * notification type that matches a bit set in this bit field. 232 * notification type that matches a bit set in this bit field.
233 */ 233 */
234#define DEV_NOTE_MASK (0xffff) 234#define DEV_NOTE_MASK (0xffff)
235#define ENABLE_DEV_NOTE(x) (1 << x) 235#define ENABLE_DEV_NOTE(x) (1 << (x))
236/* Most of the device notification types should only be used for debug. 236/* Most of the device notification types should only be used for debug.
237 * SW does need to pay attention to function wake notifications. 237 * SW does need to pay attention to function wake notifications.
238 */ 238 */
@@ -601,11 +601,11 @@ struct xhci_ep_ctx {
601#define EP_STATE_STOPPED 3 601#define EP_STATE_STOPPED 3
602#define EP_STATE_ERROR 4 602#define EP_STATE_ERROR 4
603/* Mult - Max number of burtst within an interval, in EP companion desc. */ 603/* Mult - Max number of burtst within an interval, in EP companion desc. */
604#define EP_MULT(p) ((p & 0x3) << 8) 604#define EP_MULT(p) (((p) & 0x3) << 8)
605/* bits 10:14 are Max Primary Streams */ 605/* bits 10:14 are Max Primary Streams */
606/* bit 15 is Linear Stream Array */ 606/* bit 15 is Linear Stream Array */
607/* Interval - period between requests to an endpoint - 125u increments. */ 607/* Interval - period between requests to an endpoint - 125u increments. */
608#define EP_INTERVAL(p) ((p & 0xff) << 16) 608#define EP_INTERVAL(p) (((p) & 0xff) << 16)
609#define EP_INTERVAL_TO_UFRAMES(p) (1 << (((p) >> 16) & 0xff)) 609#define EP_INTERVAL_TO_UFRAMES(p) (1 << (((p) >> 16) & 0xff))
610#define EP_MAXPSTREAMS_MASK (0x1f << 10) 610#define EP_MAXPSTREAMS_MASK (0x1f << 10)
611#define EP_MAXPSTREAMS(p) (((p) << 10) & EP_MAXPSTREAMS_MASK) 611#define EP_MAXPSTREAMS(p) (((p) << 10) & EP_MAXPSTREAMS_MASK)