return NULL;
                }
 
-               slot_index = local->slot_queue[
-                       SLOT_QUEUE_INDEX_FROM_POS_MASKED(tx_pos)];
+               slot_index = local->slot_queue[SLOT_QUEUE_INDEX_FROM_POS_MASKED(tx_pos)];
                state->tx_data =
                        (char *)SLOT_DATA_FROM_INDEX(state, slot_index);
        }
 }
 
 static ssize_t
-memcpy_copy_callback(
-       void *context, void *dest,
-       size_t offset, size_t maxsize)
+memcpy_copy_callback(void *context, void *dest, size_t offset, size_t maxsize)
 {
        memcpy(dest + offset, context + offset, maxsize);
        return maxsize;
 }
 
 static ssize_t
-copy_message_data(
-       ssize_t (*copy_callback)(void *context, void *dest,
-                                size_t offset, size_t maxsize),
+copy_message_data(ssize_t (*copy_callback)(void *context, void *dest, size_t offset,
+                                          size_t maxsize),
        void *context,
        void *dest,
        size_t size)
                 * Ensure this service doesn't use more than its quota of
                 * messages or slots
                 */
-               tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(
-                       state->local_tx_pos + stride - 1);
+               tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos + stride - 1);
 
                /*
                 * Ensure data messages don't use more than their quota of
                        spin_unlock("a_spinlock);
                        mutex_unlock(&state->slot_mutex);
 
-                       if (wait_for_completion_interruptible(
-                                               &state->data_quota_event))
+                       if (wait_for_completion_interruptible(&state->data_quota_event))
                                return VCHIQ_RETRY;
 
                        mutex_lock(&state->slot_mutex);
                        spin_lock("a_spinlock);
-                       tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(
-                               state->local_tx_pos + stride - 1);
+                       tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos + stride - 1);
                        if ((tx_end_index == state->previous_data_index) ||
                            (state->data_use_count < state->data_quota)) {
                                /* Pass the signal on to other waiters */
                                        quota->message_use_count, quota->slot_use_count);
                        VCHIQ_SERVICE_STATS_INC(service, quota_stalls);
                        mutex_unlock(&state->slot_mutex);
-                       if (wait_for_completion_interruptible(
-                                               "a->quota_event))
+                       if (wait_for_completion_interruptible("a->quota_event))
                                return VCHIQ_RETRY;
                        if (service->closing)
                                return VCHIQ_ERROR;
                                return VCHIQ_ERROR;
                        }
                        spin_lock("a_spinlock);
-                       tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(
-                               state->local_tx_pos + stride - 1);
+                       tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos + stride - 1);
                }
 
                spin_unlock("a_spinlock);
                VCHIQ_SERVICE_STATS_INC(service, bulk_stalls);
                do {
                        mutex_unlock(&service->bulk_mutex);
-                       if (wait_for_completion_interruptible(
-                                               &service->bulk_remove_event)) {
+                       if (wait_for_completion_interruptible(&service->bulk_remove_event)) {
                                status = VCHIQ_RETRY;
                                goto error_exit;
                        }