From 57d14635f976404fac165047389ff0dbe83bcd5b Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Fri, 26 May 2017 00:26:26 +0200 Subject: [PATCH] staging: vchiq_core: Replace remaining BUG_ON with WARN_ON Git-commit: 57d14635f976404fac165047389ff0dbe83bcd5b Patch-mainline: v4.13-rc1 References: FATE#324827 This replaces all remaining BUG_ON with WARN_ON. So in case of a VCHIQ bug the system is still usable. Signed-off-by: Stefan Wahren Signed-off-by: Greg Kroah-Hartman Acked-by: Takashi Iwai --- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 14 +++++----- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -312,7 +312,7 @@ unlock_service(VCHIQ_SERVICE_T *service) if (!service->ref_count) { VCHIQ_STATE_T *state = service->state; - BUG_ON(service->srvstate != VCHIQ_SRVSTATE_FREE); + WARN_ON(service->srvstate != VCHIQ_SRVSTATE_FREE); state->services[service->localport] = NULL; } else { service = NULL; @@ -838,8 +838,8 @@ queue_message(VCHIQ_STATE_T *state, VCHI return VCHIQ_ERROR; } - BUG_ON((flags & (QMFLAGS_NO_MUTEX_LOCK | - QMFLAGS_NO_MUTEX_UNLOCK)) != 0); + WARN_ON((flags & (QMFLAGS_NO_MUTEX_LOCK | + QMFLAGS_NO_MUTEX_UNLOCK)) != 0); if (service->closing) { /* The service has been closed */ @@ -938,8 +938,8 @@ queue_message(VCHIQ_STATE_T *state, VCHI header, size, VCHIQ_MSG_SRCPORT(msgid), VCHIQ_MSG_DSTPORT(msgid)); - BUG_ON((flags & (QMFLAGS_NO_MUTEX_LOCK | - QMFLAGS_NO_MUTEX_UNLOCK)) != 0); + WARN_ON((flags & (QMFLAGS_NO_MUTEX_LOCK | + QMFLAGS_NO_MUTEX_UNLOCK)) != 0); callback_result = copy_message_data(copy_callback, context, @@ -3197,7 +3197,7 @@ vchiq_close_service(VCHIQ_SERVICE_HANDLE if (current == service->state->slot_handler_thread) { status = vchiq_close_service_internal(service, 0/*!close_recvd*/); - BUG_ON(status == VCHIQ_RETRY); + WARN_ON(status == VCHIQ_RETRY); } else { /* Mark the service for termination by the slot handler */ request_poll(service->state, service, VCHIQ_POLL_TERMINATE); @@ -3259,7 +3259,7 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDL status = vchiq_close_service_internal(service, 0/*!close_recvd*/); - BUG_ON(status == VCHIQ_RETRY); + WARN_ON(status == VCHIQ_RETRY); } else { /* Mark the service for removal by the slot handler */ request_poll(service->state, service, VCHIQ_POLL_REMOVE);