gfx: pvr: keep around IOCTL names even for release build

Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.c b/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.c
index 66e4b23..8a8e290 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.c
@@ -2840,8 +2840,8 @@ _SetDispatchTableEntry(IMG_UINT32 ui32Index,
        g_BridgeDispatchTable[ui32Index].in_size = in_size;
        g_BridgeDispatchTable[ui32Index].out_size = out_size;
        g_BridgeDispatchTable[ui32Index].err_offset = err_offset;
-#if defined(DEBUG_BRIDGE_KM)
        g_BridgeDispatchTable[ui32Index].pszIOCName = pszIOCName;
+#if defined(DEBUG_BRIDGE_KM)
        g_BridgeDispatchTable[ui32Index].pszFunctionName = pszFunctionName;
        g_BridgeDispatchTable[ui32Index].ui32CallCount = 0;
        g_BridgeDispatchTable[ui32Index].ui32CopyFromUserTotalBytes = 0;
@@ -3825,9 +3825,9 @@ IMG_INT BridgedDispatchKM(PVRSRV_PER_PROCESS_DATA * psPerProc,
 
        if (psBridgePackageKM->ui32InBufferSize != dte->in_size ||
            psBridgePackageKM->ui32OutBufferSize != dte->out_size) {
-               pr_debug("pvr: invalid param size for IOCTL#%d:\n"
+               pr_debug("pvr: invalid param size for %s (%d):\n"
                        "     kern/user in,out: %d/%d,%d/%d\n",
-                       ui32BridgeID,
+                       dte->pszIOCName, ui32BridgeID,
                        dte->in_size, psBridgePackageKM->ui32InBufferSize,
                        dte->out_size, psBridgePackageKM->ui32OutBufferSize);
                goto return_fault;
@@ -3955,9 +3955,9 @@ return_fault:
        ReleaseHandleBatch(psPerProc);
 
        if (err < 0 || pvr_err)
-               pr_err("pvr: %.*s: ioctl#%d failed (err %d, pvr_err %d)\n",
+               pr_err("pvr: %.*s: ioctl %s (%d) failed (err %d, pvr_err %d)\n",
                        sizeof(psPerProc->name), psPerProc->name,
-                       ui32BridgeID, err, pvr_err);
+                       dte->pszIOCName, ui32BridgeID, err, pvr_err);
 
        return err;
 }

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.h b/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.h
index 2b3db21..6ca5903 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.h
+++ b/drivers/staging/mrst/pvr/services4/srvkm/bridged/bridged_pvr_bridge.h
@@ -161,8 +161,8 @@ typedef struct _PVRSRV_BRIDGE_DISPATCH_TABLE_ENTRY
        size_t in_size;
        size_t out_size;
        off_t err_offset;
-#if defined(DEBUG_BRIDGE_KM)
        const IMG_CHAR *pszIOCName;
+#if defined(DEBUG_BRIDGE_KM)
        const IMG_CHAR *pszFunctionName;
        IMG_UINT32 ui32CallCount;
        IMG_UINT32 ui32CopyFromUserTotalBytes;