diff options
author | David Howells <dhowells@redhat.com> | 2013-03-28 14:48:35 -0400 |
---|---|---|
committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2013-04-03 13:28:33 -0400 |
commit | eb8ccd2b481123e5fe0872a83e07ea8a6e2c4026 (patch) | |
tree | 2a8bc68b0019f2c291654ad6a6345012619740be /drivers/usb/host/xhci.h | |
parent | 6a5d6943fe0e4b1e4c43c3aa1919360f68ae2f9a (diff) |
xhci: Rename SEGMENT_SIZE and SEGMENT_SHIFT as the former is used in a.out.h
Rename SEGMENT_SIZE and SEGMENT_SHIFT as the former is used in a.out.h.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Sarah Sharp <sarah.a.sharp@linux.intel.com>
cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
cc: linux-usb@vger.kernel.org
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers/usb/host/xhci.h')
-rw-r--r-- | drivers/usb/host/xhci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index ca550ddb0b1d..29c978e37135 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h | |||
@@ -1238,8 +1238,8 @@ union xhci_trb { | |||
1238 | #define TRBS_PER_SEGMENT 64 | 1238 | #define TRBS_PER_SEGMENT 64 |
1239 | /* Allow two commands + a link TRB, along with any reserved command TRBs */ | 1239 | /* Allow two commands + a link TRB, along with any reserved command TRBs */ |
1240 | #define MAX_RSVD_CMD_TRBS (TRBS_PER_SEGMENT - 3) | 1240 | #define MAX_RSVD_CMD_TRBS (TRBS_PER_SEGMENT - 3) |
1241 | #define SEGMENT_SIZE (TRBS_PER_SEGMENT*16) | 1241 | #define TRB_SEGMENT_SIZE (TRBS_PER_SEGMENT*16) |
1242 | #define SEGMENT_SHIFT (ilog2(SEGMENT_SIZE)) | 1242 | #define TRB_SEGMENT_SHIFT (ilog2(TRB_SEGMENT_SIZE)) |
1243 | /* TRB buffer pointers can't cross 64KB boundaries */ | 1243 | /* TRB buffer pointers can't cross 64KB boundaries */ |
1244 | #define TRB_MAX_BUFF_SHIFT 16 | 1244 | #define TRB_MAX_BUFF_SHIFT 16 |
1245 | #define TRB_MAX_BUFF_SIZE (1 << TRB_MAX_BUFF_SHIFT) | 1245 | #define TRB_MAX_BUFF_SIZE (1 << TRB_MAX_BUFF_SHIFT) |