diff --git a/[refs] b/[refs] index 6ce5cba3500e..471be904c417 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd2112220b6b0a35fa12ba988a0dd837515dfaf8 +refs/heads/master: 1d08782c0ed0b5c52488dac3ae12944cc8ff39e8 diff --git a/trunk/drivers/staging/csr/csr_framework_ext.c b/trunk/drivers/staging/csr/csr_framework_ext.c index e62878ecbd25..2033e9755e4f 100644 --- a/trunk/drivers/staging/csr/csr_framework_ext.c +++ b/trunk/drivers/staging/csr/csr_framework_ext.c @@ -60,34 +60,6 @@ void CsrMutexDestroy(CsrMutexHandle *mutexHandle) { } -/*----------------------------------------------------------------------------* - * NAME - * CsrMutexLock - * - * DESCRIPTION - * Lock the mutex refered to by the provided handle. - * - * RETURNS - * Possible values: - * CSR_RESULT_SUCCESS in case of success - * CSR_FE_RESULT_INVALID_HANDLE in case the mutexHandle is invalid - * - *----------------------------------------------------------------------------*/ -CsrResult CsrMutexLock(CsrMutexHandle *mutexHandle) -{ - if (mutexHandle == NULL) - { - return CSR_FE_RESULT_INVALID_POINTER; - } - - if (down_interruptible(mutexHandle)) - { - return CSR_FE_RESULT_INVALID_POINTER; - } - - return CSR_RESULT_SUCCESS; -} - /*----------------------------------------------------------------------------* * NAME * CsrMutexUnlock diff --git a/trunk/drivers/staging/csr/csr_framework_ext.h b/trunk/drivers/staging/csr/csr_framework_ext.h index 16635a9717b3..a49e459385ba 100644 --- a/trunk/drivers/staging/csr/csr_framework_ext.h +++ b/trunk/drivers/staging/csr/csr_framework_ext.h @@ -111,21 +111,6 @@ void CsrEventDestroy(CsrEventHandle *eventHandle); *----------------------------------------------------------------------------*/ CsrResult CsrMutexCreate(CsrMutexHandle *mutexHandle); -/*----------------------------------------------------------------------------* - * NAME - * CsrMutexLock - * - * DESCRIPTION - * Lock the mutex refered to by the provided handle. - * - * RETURNS - * Possible values: - * CSR_RESULT_SUCCESS in case of success - * CSR_FE_RESULT_INVALID_HANDLE in case the mutexHandle is invalid - * - *----------------------------------------------------------------------------*/ -CsrResult CsrMutexLock(CsrMutexHandle *mutexHandle); - /*----------------------------------------------------------------------------* * NAME * CsrMutexUnlock