aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ice4100/sgx535
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-12-09 10:37:31 +0000
committerAlan Cox <alan@linux.intel.com>2010-12-09 10:37:31 +0000
commit31e9bab40e755067e15885d50a30970c0d2c32a7 (patch)
tree250e0a284cd19d59ad18dbb09424e483a1e64bc7 /drivers/staging/ice4100/sgx535
parent0ea0a682c607bd71cc750c595c276c8eb2830470 (diff)
downloadmrst-s0i3-test-31e9bab40e755067e15885d50a30970c0d2c32a7.tar.gz
mrst-s0i3-test-31e9bab40e755067e15885d50a30970c0d2c32a7.tar.xz
mrst-s0i3-test-31e9bab40e755067e15885d50a30970c0d2c32a7.zip
ice4100: Clean up some video warnings
Just to quiet it when building the tree. Signed-off-by: Alan Cox <alan@linux.intel.com>
Diffstat (limited to 'drivers/staging/ice4100/sgx535')
-rwxr-xr-xdrivers/staging/ice4100/sgx535/bridged/bridged_pvr_bridge.h6
-rwxr-xr-xdrivers/staging/ice4100/sgx535/common/pvrsrv.c4
-rwxr-xr-xdrivers/staging/ice4100/sgx535/common/ra.c4
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/osfunc.h4
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/perproc.h8
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/servicesint.h4
-rwxr-xr-xdrivers/staging/ice4100/sgx535/module.c4
-rwxr-xr-xdrivers/staging/ice4100/sgx535/system/include/syscommon.h6
8 files changed, 20 insertions, 20 deletions
diff --git a/drivers/staging/ice4100/sgx535/bridged/bridged_pvr_bridge.h b/drivers/staging/ice4100/sgx535/bridged/bridged_pvr_bridge.h
index eb5b48ab1dd..85cf48ac266 100755
--- a/drivers/staging/ice4100/sgx535/bridged/bridged_pvr_bridge.h
+++ b/drivers/staging/ice4100/sgx535/bridged/bridged_pvr_bridge.h
@@ -80,7 +80,7 @@ CopyToUserWrapper(PVRSRV_PER_PROCESS_DATA *pProcData,
ASSIGN_AND_RETURN_ON_ERROR(error, src, 0)
#if defined (PVR_SECURE_HANDLES)
-static PVRSRV_ERROR
+static inline PVRSRV_ERROR
NewHandleBatch(PVRSRV_PER_PROCESS_DATA *psPerProc,
u32 ui32BatchSize)
{
@@ -101,7 +101,7 @@ NewHandleBatch(PVRSRV_PER_PROCESS_DATA *psPerProc,
#define NEW_HANDLE_BATCH_OR_ERROR(error, psPerProc, ui32BatchSize) \
ASSIGN_AND_EXIT_ON_ERROR(error, NewHandleBatch(psPerProc, ui32BatchSize))
-static PVRSRV_ERROR
+static inline PVRSRV_ERROR
CommitHandleBatch(PVRSRV_PER_PROCESS_DATA *psPerProc)
{
PVR_ASSERT(psPerProc->bHandlesBatched);
@@ -115,7 +115,7 @@ CommitHandleBatch(PVRSRV_PER_PROCESS_DATA *psPerProc)
#define COMMIT_HANDLE_BATCH_OR_ERROR(error, psPerProc) \
ASSIGN_AND_EXIT_ON_ERROR(error, CommitHandleBatch(psPerProc))
-static void
+static inline void
ReleaseHandleBatch(PVRSRV_PER_PROCESS_DATA *psPerProc)
{
if (psPerProc->bHandlesBatched)
diff --git a/drivers/staging/ice4100/sgx535/common/pvrsrv.c b/drivers/staging/ice4100/sgx535/common/pvrsrv.c
index bb486f9f0ef..cfde445c77d 100755
--- a/drivers/staging/ice4100/sgx535/common/pvrsrv.c
+++ b/drivers/staging/ice4100/sgx535/common/pvrsrv.c
@@ -655,7 +655,7 @@ PVRSRV_ERROR PVRSRVGetMiscInfoKM_BMContext_AnyVaCb(BM_CONTEXT * psBMContext,
CHECK_SPACE(*pui32StrLen);
*pi32Count =
snprintf(*ppszStr, 100,
- "\nApplication Context (hDevMemContext) 0x%08X:\n",
+ "\nApplication Context (hDevMemContext) 0x%p:\n",
(void *)psBMContext);
UPDATE_SPACE(*ppszStr, *pi32Count, *pui32StrLen);
@@ -786,7 +786,7 @@ PVRSRV_ERROR PVRSRVGetMiscInfoKM(PVRSRV_MISC_INFO * psMiscInfo)
&ui32StrLen,
&i32Count, &pszStr);
- i32Count = snprintf(pszStr, 100, "\n\0");
+ i32Count = snprintf(pszStr, 100, "\n");
UPDATE_SPACE(pszStr, i32Count, ui32StrLen);
}
diff --git a/drivers/staging/ice4100/sgx535/common/ra.c b/drivers/staging/ice4100/sgx535/common/ra.c
index f51aea7a244..056ff0465b8 100755
--- a/drivers/staging/ice4100/sgx535/common/ra.c
+++ b/drivers/staging/ice4100/sgx535/common/ra.c
@@ -1796,7 +1796,7 @@ PVRSRV_ERROR RA_GetStats(RA_ARENA * pArena, char **ppszStr, u32 * pui32StrLen)
CHECK_SPACE(ui32StrLen);
i32Count =
snprintf(pszStr, 100,
- " allocCB=%08X freeCB=%08X handle=%08X quantum=%d\n",
+ " allocCB=%p freeCB=%p handle=%p quantum=%d\n",
pArena->pImportAlloc, pArena->pImportFree,
pArena->pImportHandle, pArena->uQuantum);
UPDATE_SPACE(pszStr, i32Count, ui32StrLen);
@@ -1875,7 +1875,7 @@ PVRSRV_ERROR RA_GetStats(RA_ARENA * pArena, char **ppszStr, u32 * pui32StrLen)
CHECK_SPACE(ui32StrLen);
i32Count =
snprintf(pszStr, 100,
- "\tbase=0x%x size=0x%x type=%s ref=%08X\n",
+ "\tbase=0x%x size=0x%x type=%s ref=%p\n",
(u32) pBT->base, pBT->uSize, _BTType(pBT->type),
pBT->psMapping);
UPDATE_SPACE(pszStr, i32Count, ui32StrLen);
diff --git a/drivers/staging/ice4100/sgx535/include/osfunc.h b/drivers/staging/ice4100/sgx535/include/osfunc.h
index f32e7415414..a3199d0e8a1 100755
--- a/drivers/staging/ice4100/sgx535/include/osfunc.h
+++ b/drivers/staging/ice4100/sgx535/include/osfunc.h
@@ -89,13 +89,13 @@ PVRSRV_ERROR OSUnRegisterDiscontigMem(void *pvCpuVAddr,
u32 ui32Flags,
void * hOSMemHandle);
-static PVRSRV_ERROR OSReserveDiscontigPhys(IMG_SYS_PHYADDR *pBasePAddr, u32 ui32Bytes, u32 ui32Flags, void **ppvCpuVAddr, void * *phOSMemHandle)
+static inline PVRSRV_ERROR OSReserveDiscontigPhys(IMG_SYS_PHYADDR *pBasePAddr, u32 ui32Bytes, u32 ui32Flags, void **ppvCpuVAddr, void * *phOSMemHandle)
{
*ppvCpuVAddr = NULL;
return OSRegisterDiscontigMem(pBasePAddr, *ppvCpuVAddr, ui32Bytes, ui32Flags, phOSMemHandle);
}
-static PVRSRV_ERROR OSUnReserveDiscontigPhys(void *pvCpuVAddr, u32 ui32Bytes, u32 ui32Flags, void * hOSMemHandle)
+static inline PVRSRV_ERROR OSUnReserveDiscontigPhys(void *pvCpuVAddr, u32 ui32Bytes, u32 ui32Flags, void * hOSMemHandle)
{
OSUnRegisterDiscontigMem(pvCpuVAddr, ui32Bytes, ui32Flags, hOSMemHandle);
return PVRSRV_OK;
diff --git a/drivers/staging/ice4100/sgx535/include/perproc.h b/drivers/staging/ice4100/sgx535/include/perproc.h
index 59336c6483a..5dc7d322ad2 100755
--- a/drivers/staging/ice4100/sgx535/include/perproc.h
+++ b/drivers/staging/ice4100/sgx535/include/perproc.h
@@ -61,27 +61,27 @@ void PVRSRVPerProcessDataDisconnect(u32 ui32PID);
PVRSRV_ERROR PVRSRVPerProcessDataInit(void);
PVRSRV_ERROR PVRSRVPerProcessDataDeInit(void);
-static
+static inline
PVRSRV_PER_PROCESS_DATA *PVRSRVFindPerProcessData(void)
{
return PVRSRVPerProcessData(OSGetCurrentProcessIDKM());
}
-static
+static inline
void * PVRSRVProcessPrivateData(PVRSRV_PER_PROCESS_DATA *psPerProc)
{
return (psPerProc != NULL) ? psPerProc->hOsPrivateData : NULL;
}
-static
+static inline
void * PVRSRVPerProcessPrivateData(u32 ui32PID)
{
return PVRSRVProcessPrivateData(PVRSRVPerProcessData(ui32PID));
}
-static
+static inline
void * PVRSRVFindPerProcessPrivateData(void)
{
return PVRSRVProcessPrivateData(PVRSRVFindPerProcessData());
diff --git a/drivers/staging/ice4100/sgx535/include/servicesint.h b/drivers/staging/ice4100/sgx535/include/servicesint.h
index 8541f9beb07..056c5fb5122 100755
--- a/drivers/staging/ice4100/sgx535/include/servicesint.h
+++ b/drivers/staging/ice4100/sgx535/include/servicesint.h
@@ -182,7 +182,7 @@ typedef struct PVRSRV_CLIENT_DEVICECLASS_INFO_TAG
} PVRSRV_CLIENT_DEVICECLASS_INFO;
-static
+static inline
u32 PVRSRVGetWriteOpsPending(PVRSRV_KERNEL_SYNC_INFO *psSyncInfo, int bIsReadOp)
{
u32 ui32WriteOpsPending;
@@ -202,7 +202,7 @@ u32 PVRSRVGetWriteOpsPending(PVRSRV_KERNEL_SYNC_INFO *psSyncInfo, int bIsReadOp)
return ui32WriteOpsPending;
}
-static
+static inline
u32 PVRSRVGetReadOpsPending(PVRSRV_KERNEL_SYNC_INFO *psSyncInfo, int bIsReadOp)
{
u32 ui32ReadOpsPending;
diff --git a/drivers/staging/ice4100/sgx535/module.c b/drivers/staging/ice4100/sgx535/module.c
index 583faaf2df1..ec9aa49b756 100755
--- a/drivers/staging/ice4100/sgx535/module.c
+++ b/drivers/staging/ice4100/sgx535/module.c
@@ -115,8 +115,8 @@ MODULE_PARM_DESC(debug, "Sets the level of debug output (default=0x4)");
extern int PVRGetDisplayClassJTable(PVRSRV_DC_DISP2SRV_KMJTABLE * psJTable);
extern int PVRGetBufferClassJTable(PVRSRV_BC_BUFFER2SRV_KMJTABLE * psJTable);
-EXPORT_SYMBOL(PVRGetDisplayClassJTable);
-EXPORT_SYMBOL(PVRGetBufferClassJTable);
+/*EXPORT_SYMBOL(PVRGetDisplayClassJTable); */
+/*EXPORT_SYMBOL(PVRGetBufferClassJTable); */
#if defined(PVR_LDM_MODULE)
static struct class *psPvrClass;
diff --git a/drivers/staging/ice4100/sgx535/system/include/syscommon.h b/drivers/staging/ice4100/sgx535/system/include/syscommon.h
index 94877364138..625d3a857fb 100755
--- a/drivers/staging/ice4100/sgx535/system/include/syscommon.h
+++ b/drivers/staging/ice4100/sgx535/system/include/syscommon.h
@@ -143,7 +143,7 @@ extern SYS_DATA* gpsSysData;
#if !defined(USE_CODE)
-static PVRSRV_ERROR SysAcquireData(SYS_DATA **ppsSysData)
+static inline PVRSRV_ERROR SysAcquireData(SYS_DATA **ppsSysData)
{
*ppsSysData = gpsSysData;
@@ -161,7 +161,7 @@ static PVRSRV_ERROR SysAcquireData(SYS_DATA **ppsSysData)
}
-static PVRSRV_ERROR SysInitialiseCommon(SYS_DATA *psSysData)
+static inline PVRSRV_ERROR SysInitialiseCommon(SYS_DATA *psSysData)
{
PVRSRV_ERROR eError;
@@ -171,7 +171,7 @@ static PVRSRV_ERROR SysInitialiseCommon(SYS_DATA *psSysData)
return eError;
}
-static void SysDeinitialiseCommon(SYS_DATA *psSysData)
+static inline void SysDeinitialiseCommon(SYS_DATA *psSysData)
{
PVRSRVDeInit(psSysData);