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

staging: octeon-usb: inline CVMX_PREFETCH0

Inline CVMX_PREFETCH0 macro.

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 c57e798cc072..b827e8dd3c47 100644
--- a/drivers/staging/octeon-usb/cvmx-usb.c
+++ b/drivers/staging/octeon-usb/cvmx-usb.c
@@ -57,7 +57,6 @@
 #include <asm/octeon/cvmx-helper.h>
 #include <asm/octeon/cvmx-helper-board.h>
 
-#define CVMX_PREFETCH0(address) CVMX_PREFETCH(address, 0)
 #define CVMX_PREFETCH128(address) CVMX_PREFETCH(address, 128)
 // a normal prefetch
 #define CVMX_PREFETCH(address, offset) CVMX_PREFETCH_PREF0(address, offset)
@@ -2667,7 +2666,7 @@ static int __cvmx_usb_poll_channel(struct cvmx_usb_internal_state *usb, int chan
 	if (!pipe)
 		return 0;
 	transaction = pipe->head;
-	CVMX_PREFETCH0(transaction);
+	CVMX_PREFETCH(transaction, 0);
 
 	/*
 	 * Disconnect this pipe from the HW channel. Later the schedule