From d4f6895d5f297dbb6de9cb968e94b11953aeb422 Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Mon, 13 Dec 2010 19:40:38 +0200 Subject: [PATCH] gpu: pvr: print some init failure messages in release mode too Signed-off-by: Imre Deak --- pvr/sgxinit.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pvr/sgxinit.c b/pvr/sgxinit.c index 0184eea..7f591a6 100644 --- a/pvr/sgxinit.c +++ b/pvr/sgxinit.c @@ -1247,8 +1247,7 @@ enum PVRSRV_ERROR SGXDevInitCompatCheck(struct PVRSRV_DEVICE_NODE *psDeviceNode) eError = SGXGetBuildInfoKM(psDevInfo, psDeviceNode); if (eError != PVRSRV_OK) { - PVR_DPF(PVR_DBG_ERROR, "SGXDevInitCompatCheck: " - "Unable to validate device DDK version"); + pr_err("pvr: unable to validate device DDK version\n"); goto exit; } psSGXFeatures = @@ -1258,9 +1257,8 @@ enum PVRSRV_ERROR SGXDevInitCompatCheck(struct PVRSRV_DEVICE_NODE *psDeviceNode) ((PVRVERSION_MAJ << 16) | (PVRVERSION_MIN << 8) | PVRVERSION_BRANCH)) || (psSGXFeatures->ui32DDKBuild != PVRVERSION_BUILD)) { - PVR_DPF(PVR_DBG_ERROR, "SGXDevInitCompatCheck: " - "Incompatible driver DDK revision (%ld)" - "/device DDK revision (%ld).", + pr_err("pvr: incompatible driver DDK revision (%d)" + "/device DDK revision (%d).\n", PVRVERSION_BUILD, psSGXFeatures->ui32DDKBuild); eError = PVRSRV_ERROR_DDK_VERSION_MISMATCH; goto exit; @@ -1276,16 +1274,14 @@ enum PVRSRV_ERROR SGXDevInitCompatCheck(struct PVRSRV_DEVICE_NODE *psDeviceNode) opt_mismatch &= ~PVRSRV_USSE_EDM_STATUS_DEBUG_SET_OFFSET; if (opt_mismatch) { if (SGX_BUILD_OPTIONS & opt_mismatch) - PVR_DPF(PVR_DBG_ERROR, "SGXInit: " - "Mismatch in driver and microkernel build " + pr_err("pvr: mismatch in driver and microkernel build " "options; extra options present in driver: " - "(0x%lx)", SGX_BUILD_OPTIONS & opt_mismatch); + "(0x%x)", SGX_BUILD_OPTIONS & opt_mismatch); if (opts & opt_mismatch) - PVR_DPF(PVR_DBG_ERROR, "SGXInit: " - "Mismatch in driver and microkernel build " + pr_err("pvr: Mismatch in driver and microkernel build " "options; extra options present in " - "microkernel: (0x%lx)", opts & opt_mismatch); + "microkernel: (0x%x)", opts & opt_mismatch); eError = PVRSRV_ERROR_BUILD_MISMATCH; goto exit; } else { -- 2.39.5