From 3cbfe457b7a57cbb570b0e965b840528c601c999 Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Tue, 6 Apr 2010 01:08:25 +0300 Subject: [PATCH] gpu: pvr: remove unused function args from HWRecoveryResetSGX MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit See the similar commits earlier in the patchset on why this is justified. Signed-off-by: Imre Deak CC: Mark Underwood CC: Mark Riding Reviewed-by: Topi Pohjolainen Reviewed-by: Ville Syrjälä --- pvr/pvr_debug.c | 2 +- pvr/sgxinfokm.h | 3 +-- pvr/sgxinit.c | 10 +++------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pvr/pvr_debug.c b/pvr/pvr_debug.c index 469d522..1280af1 100644 --- a/pvr/pvr_debug.c +++ b/pvr/pvr_debug.c @@ -303,7 +303,7 @@ static int pvr_dbg_reset(void *data, u64 val) * Finally we pass KERNEL_ID again to take and release the lock. * Yay! */ - HWRecoveryResetSGX(node, 0, TIMER_ID); + HWRecoveryResetSGX(node); SGXTestActivePowerEvent(node, KERNEL_ID); exit: diff --git a/pvr/sgxinfokm.h b/pvr/sgxinfokm.h index f2acb46..58f88a3 100644 --- a/pvr/sgxinfokm.h +++ b/pvr/sgxinfokm.h @@ -208,8 +208,7 @@ struct timer_work_data * SGXOSTimerInit(struct PVRSRV_DEVICE_NODE *psDeviceNode); void SGXOSTimerDeInit(struct timer_work_data *data); -void HWRecoveryResetSGX(struct PVRSRV_DEVICE_NODE *psDeviceNode, - u32 ui32Component, u32 ui32CallerID); +void HWRecoveryResetSGX(struct PVRSRV_DEVICE_NODE *psDeviceNode); void SGXReset(struct PVRSRV_SGXDEV_INFO *psDevInfo, u32 ui32PDUMPFlags); enum PVRSRV_ERROR SGXInitialise(struct PVRSRV_SGXDEV_INFO *psDevInfo, diff --git a/pvr/sgxinit.c b/pvr/sgxinit.c index 3d22dec..8cd0146 100644 --- a/pvr/sgxinit.c +++ b/pvr/sgxinit.c @@ -665,8 +665,7 @@ static void dump_sgx_registers(struct PVRSRV_SGXDEV_INFO *psDevInfo) } /* Should be called with pvr_lock held */ -void HWRecoveryResetSGX(struct PVRSRV_DEVICE_NODE *psDeviceNode, - u32 ui32Component, u32 ui32CallerID) +void HWRecoveryResetSGX(struct PVRSRV_DEVICE_NODE *psDeviceNode) { enum PVRSRV_ERROR eError; struct PVRSRV_SGXDEV_INFO *psDevInfo = @@ -675,8 +674,6 @@ void HWRecoveryResetSGX(struct PVRSRV_DEVICE_NODE *psDeviceNode, psDevInfo->psSGXHostCtl; u32 l; - PVR_UNREFERENCED_PARAMETER(ui32Component); - BUG_ON(!pvr_is_locked()); l = readl(&psSGXHostCtl->ui32InterruptClearFlags); @@ -774,8 +771,7 @@ static void SGXOSTimer(struct work_struct *work) l++; writel(l, &psSGXHostCtl->ui32HostDetectedLockups); - /* Note: This will release the lock when done */ - HWRecoveryResetSGX(psDeviceNode, 0, TIMER_ID); + HWRecoveryResetSGX(psDeviceNode); } queue_delayed_work(data->work_queue, &data->work, @@ -918,7 +914,7 @@ static void SGX_MISRHandler(void *pvData) l2 = readl(&psSGXHostCtl->ui32InterruptClearFlags); if ((l1 & PVRSRV_USSE_EDM_INTERRUPT_HWR) && !(l2 & PVRSRV_USSE_EDM_INTERRUPT_HWR)) - HWRecoveryResetSGX(psDeviceNode, 0, ISR_ID); + HWRecoveryResetSGX(psDeviceNode); if (psDeviceNode->bReProcessDeviceCommandComplete) SGXScheduleProcessQueuesKM(psDeviceNode); -- 2.47.2