diff --git a/drivers/gpu/nvgpu/include/nvgpu/posix/lock.h b/drivers/gpu/nvgpu/include/nvgpu/posix/lock.h index f9b001ff4..92448380c 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/posix/lock.h +++ b/drivers/gpu/nvgpu/include/nvgpu/posix/lock.h @@ -52,10 +52,6 @@ struct __nvgpu_posix_lock { static inline void nvgpu_posix_lock_acquire(struct __nvgpu_posix_lock *lock) { int err = pthread_mutex_lock(&lock->mutex); - - if (err != 0) { - nvgpu_err(NULL, "OS API pthread_mutex_lock error = %d", err); - } nvgpu_assert(err == 0); } diff --git a/drivers/gpu/nvgpu/os/posix/cond.c b/drivers/gpu/nvgpu/os/posix/cond.c index 67426bc6e..7f3f8fb6f 100644 --- a/drivers/gpu/nvgpu/os/posix/cond.c +++ b/drivers/gpu/nvgpu/os/posix/cond.c @@ -93,9 +93,6 @@ void nvgpu_cond_signal(struct nvgpu_cond *cond) nvgpu_mutex_acquire(&cond->mutex); err = pthread_cond_signal(&cond->cond); nvgpu_mutex_release(&cond->mutex); - if (err != 0) { - nvgpu_err(NULL, "OS API pthread_cond_signal error = %d", err); - } nvgpu_assert(err == 0); } @@ -109,9 +106,6 @@ void nvgpu_cond_signal_interruptible(struct nvgpu_cond *cond) nvgpu_mutex_acquire(&cond->mutex); err = pthread_cond_signal(&cond->cond); nvgpu_mutex_release(&cond->mutex); - if (err != 0) { - nvgpu_err(NULL, "OS API pthread_cond_signal error = %d", err); - } nvgpu_assert(err == 0); } @@ -156,9 +150,6 @@ void nvgpu_cond_destroy(struct nvgpu_cond *cond) BUG(); } err = pthread_cond_destroy(&cond->cond); - if (err != 0) { - nvgpu_err(NULL, "OS API pthread_cond_destroy error = %d", err); - } nvgpu_assert(err == 0); nvgpu_mutex_destroy(&cond->mutex); err = pthread_condattr_destroy(&cond->attr); @@ -176,9 +167,6 @@ void nvgpu_cond_signal_locked(struct nvgpu_cond *cond) BUG(); } err = pthread_cond_signal(&cond->cond); - if (err != 0) { - nvgpu_err(NULL, "OS API pthread_cond_signal error = %d", err); - } nvgpu_assert(err == 0); } diff --git a/drivers/gpu/nvgpu/os/posix/lock.c b/drivers/gpu/nvgpu/os/posix/lock.c index 9c4ab37e9..af34ed9fe 100644 --- a/drivers/gpu/nvgpu/os/posix/lock.c +++ b/drivers/gpu/nvgpu/os/posix/lock.c @@ -48,18 +48,12 @@ int nvgpu_mutex_tryacquire(struct nvgpu_mutex *mutex) void nvgpu_mutex_destroy(struct nvgpu_mutex *mutex) { int err = pthread_mutex_destroy(&mutex->lock.mutex); - if (err != 0) { - nvgpu_info(NULL, "Mutex destroy error %d", err); - } nvgpu_assert(err == 0); } void nvgpu_spinlock_init(struct nvgpu_spinlock *spinlock) { int err = pthread_mutex_init(&spinlock->lock.mutex, NULL); - if (err != 0) { - nvgpu_err(NULL, "OS API pthread_mutex_init error = %d", err); - } nvgpu_assert(err == 0); } @@ -76,9 +70,6 @@ void nvgpu_spinlock_release(struct nvgpu_spinlock *spinlock) void nvgpu_raw_spinlock_init(struct nvgpu_raw_spinlock *spinlock) { int err = pthread_mutex_init(&spinlock->lock.mutex, NULL); - if (err != 0) { - nvgpu_err(NULL, "OS API pthread_mutex_init error = %d", err); - } nvgpu_assert(err == 0); } diff --git a/drivers/gpu/nvgpu/os/posix/rwsem.c b/drivers/gpu/nvgpu/os/posix/rwsem.c index 6288ddcef..7a58900d9 100644 --- a/drivers/gpu/nvgpu/os/posix/rwsem.c +++ b/drivers/gpu/nvgpu/os/posix/rwsem.c @@ -28,9 +28,6 @@ void nvgpu_rwsem_init(struct nvgpu_rwsem *rwsem) { int err = pthread_rwlock_init(&rwsem->rw_sem, NULL); - if (err != 0) { - nvgpu_err(NULL, "OS API pthread_rwlock_init error = %d", err); - } nvgpu_assert(err == 0); } @@ -40,9 +37,6 @@ void nvgpu_rwsem_init(struct nvgpu_rwsem *rwsem) void nvgpu_rwsem_down_read(struct nvgpu_rwsem *rwsem) { int err = pthread_rwlock_rdlock(&rwsem->rw_sem); - if (err != 0) { - nvgpu_err(NULL, "OS API pthread_rwlock_rdlock err = %d", err); - } nvgpu_assert(err == 0); } @@ -52,26 +46,17 @@ void nvgpu_rwsem_down_read(struct nvgpu_rwsem *rwsem) void nvgpu_rwsem_up_read(struct nvgpu_rwsem *rwsem) { int err = pthread_rwlock_unlock(&rwsem->rw_sem); - if (err != 0) { - nvgpu_err(NULL, "OS API pthread_rwlock_unlock err = %d", err); - } nvgpu_assert(err == 0); } void nvgpu_rwsem_down_write(struct nvgpu_rwsem *rwsem) { int err = pthread_rwlock_wrlock(&rwsem->rw_sem); - if (err != 0) { - nvgpu_err(NULL, "OS API pthread_rwlock_wrlock err = %d", err); - } nvgpu_assert(err == 0); } void nvgpu_rwsem_up_write(struct nvgpu_rwsem *rwsem) { int err = pthread_rwlock_unlock(&rwsem->rw_sem); - if (err != 0) { - nvgpu_err(NULL, "OS API pthread_rwlock_unlock err = %d", err); - } nvgpu_assert(err == 0); }