From a2b98ecd962419ca6bb52e70627c4b721398f2e5 Mon Sep 17 00:00:00 2001
From: Imre Deak <imre.deak@nokia.com>
Date: Tue, 6 Apr 2010 01:43:29 +0300
Subject: [PATCH] gpu: pvr: no need to check for retry failures in
 SGXScheduleCCBCommandKM
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Powering on the device can't fail any more with a 'retry' error so we can't
have the corresponding condition here. See the similar commit earlier in the
patchset for a more detailed explanation.

Signed-off-by: Imre Deak <imre.deak@nokia.com>
CC: Mark Underwood <mark.underwood@imgtec.com>
CC: Mark Riding <mark.riding@imgtec.com>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@nokia.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
---
 pvr/sgxutils.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pvr/sgxutils.c b/pvr/sgxutils.c
index beb8a57..1d693e7 100644
--- a/pvr/sgxutils.c
+++ b/pvr/sgxutils.c
@@ -275,19 +275,8 @@ enum PVRSRV_ERROR SGXScheduleCCBCommandKM(
 	if (eError == PVRSRV_OK) {
 		psDeviceNode->bReProcessDeviceCommandComplete = IMG_FALSE;
 	} else {
-		if (eError == PVRSRV_ERROR_RETRY) {
-			if (ui32CallerID == ISR_ID) {
-				psDeviceNode->bReProcessDeviceCommandComplete =
-				    IMG_TRUE;
-				eError = PVRSRV_OK;
-			} else {
-
-			}
-		} else
-			PVR_DPF(PVR_DBG_ERROR, "SGXScheduleCCBCommandKM "
-					"failed to acquire lock - "
-					 "ui32CallerID:%ld eError:%lu",
-					 ui32CallerID, eError);
+		PVR_DPF(PVR_DBG_ERROR, "%s: can't power on device (%d)",
+					__func__, eError);
 		return eError;
 	}
 
-- 
2.39.5