From: Lijun Pan <LIJUN.PAN@FREESCALE.COM>
Date: Fri, 20 Jun 2014 17:18:39 +0000 (-0500)
Subject: driver/usb: include upper/lower_32_bits() from linux/compat.h
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;ds=inline;h=4a755f1da52f2baee68888e21599dc8b80c89033;p=people%2Fms%2Fu-boot.git

driver/usb: include upper/lower_32_bits() from linux/compat.h

upper_32_bits() and lower_32_bits() have been ported into linux/compat.h.
Start use them now in drivers/usb/host/xhci.h.

Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com>
---

diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index ceb1573d86..6685ed23de 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
@@ -1121,7 +1119,7 @@ static inline void xhci_writeq(__le64 volatile *regs, const u64 val)
 	__u32 *ptr = (__u32 *)regs;
 	u32 val_lo = lower_32_bits(val);
 	/* FIXME */
-	u32 val_hi = 0;
+	u32 val_hi = upper_32_bits(val);
 	writel(val_lo, ptr);
 	writel(val_hi, ptr + 1);
 }