lower_32_bits and upper_32_bits are very useful while programming. Port these two functions here from Linux:include/linux/kernel.h, also remove the definition in drivers/usb/host/xhci.h. Later on, developers could include linux/compat.h if they want to use these two functions.

Signed-off-by: Lijun Pan Lijun.Pan@freescale.com --- drivers/usb/host/xhci.h | 4 +--- include/linux/compat.h | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index ceb1573..6381596 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -20,9 +20,7 @@ #include <asm/cache.h> #include <asm/io.h> #include <linux/list.h> - -#define upper_32_bits(n) (u32)((n) >> 32) -#define lower_32_bits(n) (u32)(n) +#include <linux/compat.h>

#define MAX_EP_CTX_NUM 31 #define XHCI_ALIGNMENT 64 diff --git a/include/linux/compat.h b/include/linux/compat.h index 3fdfb39..bc51dd1 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -57,4 +57,21 @@ , __FILE__, __LINE__); }

#define PAGE_SIZE 4096 + +/** + * upper_32_bits - return bits 32-63 of a number + * @n: the number we're accessing + * + * A basic shift-right of a 64- or 32-bit quantity. Use this to suppress + * the "right shift count >= width of type" warning when that quantity is + * 32-bits. + */ +#define upper_32_bits(n) ((u32)(((n) >> 16) >> 16)) + +/** + * lower_32_bits - return bits 0-31 of a number + * @n: the number we're accessing + */ +#define lower_32_bits(n) ((u32)(n)) + #endif