staging: vchiq_core: Replace remaining BUG_ON with WARN_ON (57d14635) · Commits · 戴 / test

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -313,7 +313,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;
		@@ -839,7 +839,7 @@ queue_message(VCHIQ_STATE_T state, VCHIQ_SERVICE_T service,
		return VCHIQ_ERROR;
		}

		BUG_ON((flags & (QMFLAGS_NO_MUTEX_LOCK \|
		WARN_ON((flags & (QMFLAGS_NO_MUTEX_LOCK \|
		QMFLAGS_NO_MUTEX_UNLOCK)) != 0);

		if (service->closing) {
		@@ -939,7 +939,7 @@ queue_message(VCHIQ_STATE_T state, VCHIQ_SERVICE_T service,
		header, size, VCHIQ_MSG_SRCPORT(msgid),
		VCHIQ_MSG_DSTPORT(msgid));

		BUG_ON((flags & (QMFLAGS_NO_MUTEX_LOCK \|
		WARN_ON((flags & (QMFLAGS_NO_MUTEX_LOCK \|
		QMFLAGS_NO_MUTEX_UNLOCK)) != 0);

		callback_result =
		@@ -3204,7 +3204,7 @@ vchiq_close_service(VCHIQ_SERVICE_HANDLE_T 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);
		@@ -3266,7 +3266,7 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)

		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);

Admin message