From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Tue, 1 Oct 2013 20:43:17 +0000 (+0300)
Subject: staging: octeon-usb: eliminate CVMX_PREFETCH_PREFX
X-Git-Tag: MMI-PSA29.97-13-9~13364^2~515
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5bffcff517234e3d2611f3504ff82c92152bcd36;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

staging: octeon-usb: eliminate CVMX_PREFETCH_PREFX

Eliminate CVMX_PREFETCH_PREFX.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/octeon-usb/cvmx-usb.c b/drivers/staging/octeon-usb/cvmx-usb.c
index d53daf7ee2b2..9647deb37325 100644
--- a/drivers/staging/octeon-usb/cvmx-usb.c
+++ b/drivers/staging/octeon-usb/cvmx-usb.c
@@ -57,9 +57,8 @@
 #include <asm/octeon/cvmx-helper.h>
 #include <asm/octeon/cvmx-helper-board.h>
 
-// normal prefetches that use the pref instruction
-#define CVMX_PREFETCH_PREFX(X, address, offset) asm volatile ("pref %[type], %[off](%[rbase])" : : [rbase] "d" (address), [off] "I" (offset), [type] "n" (X))
-#define CVMX_PREFETCH(address, offset) CVMX_PREFETCH_PREFX(0, address, offset)
+/* Normal prefetch that use the pref instruction. */
+#define CVMX_PREFETCH(address, offset) asm volatile ("pref %[type], %[off](%[rbase])" : : [rbase] "d" (address), [off] "I" (offset), [type] "n" (0))
 
 #define MAX_RETRIES		3		/* Maximum number of times to retry failed transactions */
 #define MAX_PIPES		32		/* Maximum number of pipes that can be open at once */