[IA64] run rest drivers/misc/sgi-xp through scripts/Lindent

Ran patches through scripts/Lindent (part 2).

Signed-off-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 148 insertions, 242 deletions

diff --git a/drivers/misc/sgi-xp/xpc_channel.c b/drivers/misc/sgi-xp/xpc_channel.c
index d7a215eeaaf6..15cb91a82102 100644
--- a/drivers/misc/sgi-xp/xpc_channel.c
+++ b/drivers/misc/sgi-xp/xpc_channel.c
@@ -6,7 +6,6 @@
  * Copyright (c) 2004-2008 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
-
 /*
  * Cross Partition Communication (XPC) channel support.
  *
@@ -15,7 +14,6 @@
  *
  */
 
-
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/sched.h>
@@ -27,7 +25,6 @@
 #include <asm/sn/sn_sal.h>
 #include "xpc.h"
 
-
 /*
  * Guarantee that the kzalloc'd memory is cacheline aligned.
  */
@@ -39,7 +36,7 @@ xpc_kzalloc_cacheline_aligned(size_t size, gfp_t flags, void **base)
         if (*base == NULL) {
                 return NULL;
         }
-        if ((u64) *base == L1_CACHE_ALIGN((u64) *base)) {
+        if ((u64)*base == L1_CACHE_ALIGN((u64)*base)) {
                 return *base;
         }
         kfree(*base);
@@ -49,10 +46,9 @@ xpc_kzalloc_cacheline_aligned(size_t size, gfp_t flags, void **base)
         if (*base == NULL) {
                 return NULL;
         }
-        return (void *) L1_CACHE_ALIGN((u64) *base);
+        return (void *)L1_CACHE_ALIGN((u64)*base);
 }
 
-
 /*
  * Set up the initial values for the XPartition Communication channels.
  */
@@ -62,7 +58,6 @@ xpc_initialize_channels(struct xpc_partition *part, partid_t partid)
         int ch_number;
         struct xpc_channel *ch;
 
-
         for (ch_number = 0; ch_number < part->nchannels; ch_number++) {
                 ch = &part->channels[ch_number];
 
@@ -72,7 +67,7 @@ xpc_initialize_channels(struct xpc_partition *part, partid_t partid)
 
                 ch->local_GP = &part->local_GPs[ch_number];
                 ch->local_openclose_args =
-                                        &part->local_openclose_args[ch_number];
+                    &part->local_openclose_args[ch_number];
 
                 atomic_set(&ch->kthreads_assigned, 0);
                 atomic_set(&ch->kthreads_idle, 0);
@@ -91,7 +86,6 @@ xpc_initialize_channels(struct xpc_partition *part, partid_t partid)
         }
 }
 
-
 /*
  * Setup the infrastructure necessary to support XPartition Communication
  * between the specified remote partition and the local one.
@@ -103,7 +97,6 @@ xpc_setup_infrastructure(struct xpc_partition *part)
         struct timer_list *timer;
         partid_t partid = XPC_PARTID(part);
 
-
         /*
          * Zero out MOST of the entry for this partition. Only the fields
          * starting with `nchannels' will be zeroed. The preceding fields must
@@ -111,14 +104,14 @@ xpc_setup_infrastructure(struct xpc_partition *part)
          * referenced during this memset() operation.
          */
         memset(&part->nchannels, 0, sizeof(struct xpc_partition) -
-                                offsetof(struct xpc_partition, nchannels));
+               offsetof(struct xpc_partition, nchannels));
 
         /*
          * Allocate all of the channel structures as a contiguous chunk of
          * memory.
          */
         part->channels = kzalloc(sizeof(struct xpc_channel) * XPC_NCHANNELS,
-                                                                GFP_KERNEL);
+                                 GFP_KERNEL);
         if (part->channels == NULL) {
                 dev_err(xpc_chan, "can't get memory for channels\n");
                 return xpcNoMemory;
@@ -126,11 +119,11 @@ xpc_setup_infrastructure(struct xpc_partition *part)
 
         part->nchannels = XPC_NCHANNELS;
 
-
         /* allocate all the required GET/PUT values */
 
         part->local_GPs = xpc_kzalloc_cacheline_aligned(XPC_GP_SIZE,
-                                        GFP_KERNEL, &part->local_GPs_base);
+                                                        GFP_KERNEL,
+                                                        &part->local_GPs_base);
         if (part->local_GPs == NULL) {
                 kfree(part->channels);
                 part->channels = NULL;
@@ -140,7 +133,9 @@ xpc_setup_infrastructure(struct xpc_partition *part)
         }
 
         part->remote_GPs = xpc_kzalloc_cacheline_aligned(XPC_GP_SIZE,
-                                        GFP_KERNEL, &part->remote_GPs_base);
+                                                         GFP_KERNEL,
+                                                         &part->
+                                                         remote_GPs_base);
         if (part->remote_GPs == NULL) {
                 dev_err(xpc_chan, "can't get memory for remote get/put "
                         "values\n");
@@ -151,12 +146,11 @@ xpc_setup_infrastructure(struct xpc_partition *part)
                 return xpcNoMemory;
         }
 
-
         /* allocate all the required open and close args */
 
-        part->local_openclose_args = xpc_kzalloc_cacheline_aligned(
-                                        XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL,
-                                        &part->local_openclose_args_base);
+        part->local_openclose_args =
+            xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL,
+                                          &part->local_openclose_args_base);
         if (part->local_openclose_args == NULL) {
                 dev_err(xpc_chan, "can't get memory for local connect args\n");
                 kfree(part->remote_GPs_base);
@@ -168,9 +162,9 @@ xpc_setup_infrastructure(struct xpc_partition *part)
                 return xpcNoMemory;
         }
 
-        part->remote_openclose_args = xpc_kzalloc_cacheline_aligned(
-                                        XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL,
-                                        &part->remote_openclose_args_base);
+        part->remote_openclose_args =
+            xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL,
+                                          &part->remote_openclose_args_base);
         if (part->remote_openclose_args == NULL) {
                 dev_err(xpc_chan, "can't get memory for remote connect args\n");
                 kfree(part->local_openclose_args_base);
@@ -184,13 +178,11 @@ xpc_setup_infrastructure(struct xpc_partition *part)
                 return xpcNoMemory;
         }
 
-
         xpc_initialize_channels(part, partid);
 
         atomic_set(&part->nchannels_active, 0);
         atomic_set(&part->nchannels_engaged, 0);
 
-
         /* local_IPI_amo were set to 0 by an earlier memset() */
 
         /* Initialize this partitions AMO_t structure */
@@ -203,7 +195,7 @@ xpc_setup_infrastructure(struct xpc_partition *part)
 
         sprintf(part->IPI_owner, "xpc%02d", partid);
         ret = request_irq(SGI_XPC_NOTIFY, xpc_notify_IRQ_handler, IRQF_SHARED,
-                                part->IPI_owner, (void *) (u64) partid);
+                          part->IPI_owner, (void *)(u64)partid);
         if (ret != 0) {
                 dev_err(xpc_chan, "can't register NOTIFY IRQ handler, "
                         "errno=%d\n", -ret);
@@ -223,8 +215,8 @@ xpc_setup_infrastructure(struct xpc_partition *part)
         /* Setup a timer to check for dropped IPIs */
         timer = &part->dropped_IPI_timer;
         init_timer(timer);
-        timer->function = (void (*)(unsigned long)) xpc_dropped_IPI_check;
-        timer->data = (unsigned long) part;
+        timer->function = (void (*)(unsigned long))xpc_dropped_IPI_check;
+        timer->data = (unsigned long)part;
         timer->expires = jiffies + XPC_P_DROPPED_IPI_WAIT;
         add_timer(timer);
 
@@ -234,7 +226,6 @@ xpc_setup_infrastructure(struct xpc_partition *part)
          */
         part->setup_state = XPC_P_SETUP;
 
-
         /*
          * Setup the per partition specific variables required by the
          * remote partition to establish channel connections with us.
@@ -244,7 +235,7 @@ xpc_setup_infrastructure(struct xpc_partition *part)
          */
         xpc_vars_part[partid].GPs_pa = __pa(part->local_GPs);
         xpc_vars_part[partid].openclose_args_pa =
-                                        __pa(part->local_openclose_args);
+            __pa(part->local_openclose_args);
         xpc_vars_part[partid].IPI_amo_pa = __pa(part->local_IPI_amo_va);
         cpuid = raw_smp_processor_id(); /* any CPU in this partition will do */
         xpc_vars_part[partid].IPI_nasid = cpuid_to_nasid(cpuid);
@@ -255,7 +246,6 @@ xpc_setup_infrastructure(struct xpc_partition *part)
         return xpcSuccess;
 }
 
-
 /*
  * Create a wrapper that hides the underlying mechanism for pulling a cacheline
  * (or multiple cachelines) from a remote partition.
@@ -266,21 +256,20 @@ xpc_setup_infrastructure(struct xpc_partition *part)
  */
 static enum xpc_retval
 xpc_pull_remote_cachelines(struct xpc_partition *part, void *dst,
-                                const void *src, size_t cnt)
+                           const void *src, size_t cnt)
 {
         bte_result_t bte_ret;
 
-
-        DBUG_ON((u64) src != L1_CACHE_ALIGN((u64) src));
-        DBUG_ON((u64) dst != L1_CACHE_ALIGN((u64) dst));
+        DBUG_ON((u64)src != L1_CACHE_ALIGN((u64)src));
+        DBUG_ON((u64)dst != L1_CACHE_ALIGN((u64)dst));
         DBUG_ON(cnt != L1_CACHE_ALIGN(cnt));
 
         if (part->act_state == XPC_P_DEACTIVATING) {
                 return part->reason;
         }
 
-        bte_ret = xp_bte_copy((u64) src, (u64) dst, (u64) cnt,
-                                        (BTE_NORMAL | BTE_WACQUIRE), NULL);
+        bte_ret = xp_bte_copy((u64)src, (u64)dst, (u64)cnt,
+                              (BTE_NORMAL | BTE_WACQUIRE), NULL);
         if (bte_ret == BTE_SUCCESS) {
                 return xpcSuccess;
         }
@@ -291,7 +280,6 @@ xpc_pull_remote_cachelines(struct xpc_partition *part, void *dst,
         return xpc_map_bte_errors(bte_ret);
 }
 
-
 /*
  * Pull the remote per partition specific variables from the specified
  * partition.
@@ -301,41 +289,40 @@ xpc_pull_remote_vars_part(struct xpc_partition *part)
 {
         u8 buffer[L1_CACHE_BYTES * 2];
         struct xpc_vars_part *pulled_entry_cacheline =
-                        (struct xpc_vars_part *) L1_CACHE_ALIGN((u64) buffer);
+            (struct xpc_vars_part *)L1_CACHE_ALIGN((u64)buffer);
         struct xpc_vars_part *pulled_entry;
         u64 remote_entry_cacheline_pa, remote_entry_pa;
         partid_t partid = XPC_PARTID(part);
         enum xpc_retval ret;
 
-
         /* pull the cacheline that contains the variables we're interested in */
 
         DBUG_ON(part->remote_vars_part_pa !=
-                                L1_CACHE_ALIGN(part->remote_vars_part_pa));
+                L1_CACHE_ALIGN(part->remote_vars_part_pa));
         DBUG_ON(sizeof(struct xpc_vars_part) != L1_CACHE_BYTES / 2);
 
         remote_entry_pa = part->remote_vars_part_pa +
-                        sn_partition_id * sizeof(struct xpc_vars_part);
+            sn_partition_id * sizeof(struct xpc_vars_part);
 
         remote_entry_cacheline_pa = (remote_entry_pa & ~(L1_CACHE_BYTES - 1));
 
-        pulled_entry = (struct xpc_vars_part *) ((u64) pulled_entry_cacheline +
-                                (remote_entry_pa & (L1_CACHE_BYTES - 1)));
+        pulled_entry = (struct xpc_vars_part *)((u64)pulled_entry_cacheline +
+                                                (remote_entry_pa &
+                                                 (L1_CACHE_BYTES - 1)));
 
         ret = xpc_pull_remote_cachelines(part, pulled_entry_cacheline,
-                                        (void *) remote_entry_cacheline_pa,
-                                        L1_CACHE_BYTES);
+                                         (void *)remote_entry_cacheline_pa,
+                                         L1_CACHE_BYTES);
         if (ret != xpcSuccess) {
                 dev_dbg(xpc_chan, "failed to pull XPC vars_part from "
                         "partition %d, ret=%d\n", partid, ret);
                 return ret;
         }
 
-
         /* see if they've been set up yet */
 
         if (pulled_entry->magic != XPC_VP_MAGIC1 &&
-                                pulled_entry->magic != XPC_VP_MAGIC2) {
+            pulled_entry->magic != XPC_VP_MAGIC2) {
 
                 if (pulled_entry->magic != 0) {
                         dev_dbg(xpc_chan, "partition %d's XPC vars_part for "
@@ -353,8 +340,8 @@ xpc_pull_remote_vars_part(struct xpc_partition *part)
                 /* validate the variables */
 
                 if (pulled_entry->GPs_pa == 0 ||
-                                pulled_entry->openclose_args_pa == 0 ||
-                                        pulled_entry->IPI_amo_pa == 0) {
+                    pulled_entry->openclose_args_pa == 0 ||
+                    pulled_entry->IPI_amo_pa == 0) {
 
                         dev_err(xpc_chan, "partition %d's XPC vars_part for "
                                 "partition %d are not valid\n", partid,
@@ -366,9 +353,9 @@ xpc_pull_remote_vars_part(struct xpc_partition *part)
 
                 part->remote_GPs_pa = pulled_entry->GPs_pa;
                 part->remote_openclose_args_pa =
-                                        pulled_entry->openclose_args_pa;
+                    pulled_entry->openclose_args_pa;
                 part->remote_IPI_amo_va =
-                                      (AMO_t *) __va(pulled_entry->IPI_amo_pa);
+                    (AMO_t *)__va(pulled_entry->IPI_amo_pa);
                 part->remote_IPI_nasid = pulled_entry->IPI_nasid;
                 part->remote_IPI_phys_cpuid = pulled_entry->IPI_phys_cpuid;
 
@@ -388,7 +375,6 @@ xpc_pull_remote_vars_part(struct xpc_partition *part)
         return xpcSuccess;
 }
 
-
 /*
  * Get the IPI flags and pull the openclose args and/or remote GPs as needed.
  */
@@ -399,7 +385,6 @@ xpc_get_IPI_flags(struct xpc_partition *part)
         u64 IPI_amo;
         enum xpc_retval ret;
 
-
         /*
          * See if there are any IPI flags to be handled.
          */
@@ -410,12 +395,12 @@ xpc_get_IPI_flags(struct xpc_partition *part)
         }
         spin_unlock_irqrestore(&part->IPI_lock, irq_flags);
 
-
         if (XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(IPI_amo)) {
                 ret = xpc_pull_remote_cachelines(part,
-                                        part->remote_openclose_args,
-                                        (void *) part->remote_openclose_args_pa,
-                                        XPC_OPENCLOSE_ARGS_SIZE);
+                                                 part->remote_openclose_args,
+                                                 (void *)part->
+                                                 remote_openclose_args_pa,
+                                                 XPC_OPENCLOSE_ARGS_SIZE);
                 if (ret != xpcSuccess) {
                         XPC_DEACTIVATE_PARTITION(part, ret);
 
@@ -430,8 +415,8 @@ xpc_get_IPI_flags(struct xpc_partition *part)
 
         if (XPC_ANY_MSG_IPI_FLAGS_SET(IPI_amo)) {
                 ret = xpc_pull_remote_cachelines(part, part->remote_GPs,
-                                                (void *) part->remote_GPs_pa,
-                                                XPC_GP_SIZE);
+                                                 (void *)part->remote_GPs_pa,
+                                                 XPC_GP_SIZE);
                 if (ret != xpcSuccess) {
                         XPC_DEACTIVATE_PARTITION(part, ret);
 
@@ -446,7 +431,6 @@ xpc_get_IPI_flags(struct xpc_partition *part)
         return IPI_amo;
 }
 
-
 /*
  * Allocate the local message queue and the notify queue.
  */
@@ -457,7 +441,6 @@ xpc_allocate_local_msgqueue(struct xpc_channel *ch)
         int nentries;
         size_t nbytes;
 
-
         // >>> may want to check for ch->flags & XPC_C_DISCONNECTING between
         // >>> iterations of the for-loop, bail if set?
 
@@ -466,8 +449,9 @@ xpc_allocate_local_msgqueue(struct xpc_channel *ch)
 
                 nbytes = nentries * ch->msg_size;
                 ch->local_msgqueue = xpc_kzalloc_cacheline_aligned(nbytes,
-                                                GFP_KERNEL,
-                                                &ch->local_msgqueue_base);
+                                                                   GFP_KERNEL,
+                                                                   &ch->
+                                                                   local_msgqueue_base);
                 if (ch->local_msgqueue == NULL) {
                         continue;
                 }
@@ -497,7 +481,6 @@ xpc_allocate_local_msgqueue(struct xpc_channel *ch)
         return xpcNoMemory;
 }
 
-
 /*
  * Allocate the cached remote message queue.
  */
@@ -508,7 +491,6 @@ xpc_allocate_remote_msgqueue(struct xpc_channel *ch)
         int nentries;
         size_t nbytes;
 
-
         DBUG_ON(ch->remote_nentries <= 0);
 
         // >>> may want to check for ch->flags & XPC_C_DISCONNECTING between
@@ -519,8 +501,9 @@ xpc_allocate_remote_msgqueue(struct xpc_channel *ch)
 
                 nbytes = nentries * ch->msg_size;
                 ch->remote_msgqueue = xpc_kzalloc_cacheline_aligned(nbytes,
-                                                GFP_KERNEL,
-                                                &ch->remote_msgqueue_base);
+                                                                    GFP_KERNEL,
+                                                                    &ch->
+                                                                    remote_msgqueue_base);
                 if (ch->remote_msgqueue == NULL) {
                         continue;
                 }
@@ -542,7 +525,6 @@ xpc_allocate_remote_msgqueue(struct xpc_channel *ch)
         return xpcNoMemory;
 }
 
-
 /*
  * Allocate message queues and other stuff associated with a channel.
  *
@@ -554,7 +536,6 @@ xpc_allocate_msgqueues(struct xpc_channel *ch)
         unsigned long irq_flags;
         enum xpc_retval ret;
 
-
         DBUG_ON(ch->flags & XPC_C_SETUP);
 
         if ((ret = xpc_allocate_local_msgqueue(ch)) != xpcSuccess) {
@@ -576,7 +557,6 @@ xpc_allocate_msgqueues(struct xpc_channel *ch)
         return xpcSuccess;
 }
 
-
 /*
  * Process a connect message from a remote partition.
  *
@@ -588,11 +568,10 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)
 {
         enum xpc_retval ret;
 
-
         DBUG_ON(!spin_is_locked(&ch->lock));
 
         if (!(ch->flags & XPC_C_OPENREQUEST) ||
-                                !(ch->flags & XPC_C_ROPENREQUEST)) {
+            !(ch->flags & XPC_C_ROPENREQUEST)) {
                 /* nothing more to do for now */
                 return;
         }
@@ -629,14 +608,13 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)
         ch->flags = (XPC_C_CONNECTED | XPC_C_SETUP);    /* clear all else */
 
         dev_info(xpc_chan, "channel %d to partition %d connected\n",
-                ch->number, ch->partid);
+                 ch->number, ch->partid);
 
         spin_unlock_irqrestore(&ch->lock, *irq_flags);
         xpc_create_kthreads(ch, 1, 0);
         spin_lock_irqsave(&ch->lock, *irq_flags);
 }
 
-
 /*
  * Notify those who wanted to be notified upon delivery of their message.
  */
@@ -647,7 +625,6 @@ xpc_notify_senders(struct xpc_channel *ch, enum xpc_retval reason, s64 put)
         u8 notify_type;
         s64 get = ch->w_remote_GP.get - 1;
 
-
         while (++get < put && atomic_read(&ch->n_to_notify) > 0) {
 
                 notify = &ch->notify_queue[get % ch->local_nentries];
@@ -660,8 +637,7 @@ xpc_notify_senders(struct xpc_channel *ch, enum xpc_retval reason, s64 put)
                  */
                 notify_type = notify->type;
                 if (notify_type == 0 ||
-                                cmpxchg(&notify->type, notify_type, 0) !=
-                                                                notify_type) {
+                    cmpxchg(&notify->type, notify_type, 0) != notify_type) {
                         continue;
                 }
 
@@ -672,20 +648,19 @@ xpc_notify_senders(struct xpc_channel *ch, enum xpc_retval reason, s64 put)
                 if (notify->func != NULL) {
                         dev_dbg(xpc_chan, "notify->func() called, notify=0x%p, "
                                 "msg_number=%ld, partid=%d, channel=%d\n",
-                                (void *) notify, get, ch->partid, ch->number);
+                                (void *)notify, get, ch->partid, ch->number);
 
                         notify->func(reason, ch->partid, ch->number,
-                                                                notify->key);
+                                     notify->key);
 
                         dev_dbg(xpc_chan, "notify->func() returned, "
                                 "notify=0x%p, msg_number=%ld, partid=%d, "
-                                "channel=%d\n", (void *) notify, get,
+                                "channel=%d\n", (void *)notify, get,
                                 ch->partid, ch->number);
                 }
         }
 }
 
-
 /*
  * Free up message queues and other stuff that were allocated for the specified
  * channel.
@@ -733,7 +708,6 @@ xpc_free_msgqueues(struct xpc_channel *ch)
         }
 }
 
-
 /*
  * spin_lock_irqsave() is expected to be held on entry.
  */
@@ -743,7 +717,6 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
         struct xpc_partition *part = &xpc_partitions[ch->partid];
         u32 channel_was_connected = (ch->flags & XPC_C_WASCONNECTED);
 
-
         DBUG_ON(!spin_is_locked(&ch->lock));
 
         if (!(ch->flags & XPC_C_DISCONNECTING)) {
@@ -755,11 +728,11 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
         /* make sure all activity has settled down first */
 
         if (atomic_read(&ch->kthreads_assigned) > 0 ||
-                                atomic_read(&ch->references) > 0) {
+            atomic_read(&ch->references) > 0) {
                 return;
         }
         DBUG_ON((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
-                        !(ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE));
+                !(ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE));
 
         if (part->act_state == XPC_P_DEACTIVATING) {
                 /* can't proceed until the other side disengages from us */
@@ -809,7 +782,7 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
 
         if (channel_was_connected) {
                 dev_info(xpc_chan, "channel %d to partition %d disconnected, "
-                        "reason=%d\n", ch->number, ch->partid, ch->reason);
+                         "reason=%d\n", ch->number, ch->partid, ch->reason);
         }
 
         if (ch->flags & XPC_C_WDISCONNECT) {
@@ -820,35 +793,31 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
                         /* time to take action on any delayed IPI flags */
                         spin_lock(&part->IPI_lock);
                         XPC_SET_IPI_FLAGS(part->local_IPI_amo, ch->number,
-                                                        ch->delayed_IPI_flags);
+                                          ch->delayed_IPI_flags);
                         spin_unlock(&part->IPI_lock);
                 }
                 ch->delayed_IPI_flags = 0;
         }
 }
 
-
 /*
  * Process a change in the channel's remote connection state.
  */
 static void
 xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number,
-                                u8 IPI_flags)
+                          u8 IPI_flags)
 {
         unsigned long irq_flags;
         struct xpc_openclose_args *args =
-                                &part->remote_openclose_args[ch_number];
+            &part->remote_openclose_args[ch_number];
         struct xpc_channel *ch = &part->channels[ch_number];
         enum xpc_retval reason;
 
-
-
         spin_lock_irqsave(&ch->lock, irq_flags);
 
-again:
+      again:
 
-        if ((ch->flags & XPC_C_DISCONNECTED) &&
-                                        (ch->flags & XPC_C_WDISCONNECT)) {
+        if ((ch->flags & XPC_C_DISCONNECTED) && (ch->flags & XPC_C_WDISCONNECT)) {
                 /*
                  * Delay processing IPI flags until thread waiting disconnect
                  * has had a chance to see that the channel is disconnected.
@@ -858,7 +827,6 @@ again:
                 return;
         }
 
-
         if (IPI_flags & XPC_IPI_CLOSEREQUEST) {
 
                 dev_dbg(xpc_chan, "XPC_IPI_CLOSEREQUEST (reason=%d) received "
@@ -890,13 +858,14 @@ again:
                 if (ch->flags & XPC_C_DISCONNECTED) {
                         if (!(IPI_flags & XPC_IPI_OPENREQUEST)) {
                                 if ((XPC_GET_IPI_FLAGS(part->local_IPI_amo,
-                                         ch_number) & XPC_IPI_OPENREQUEST)) {
+                                                       ch_number) &
+                                     XPC_IPI_OPENREQUEST)) {
 
                                         DBUG_ON(ch->delayed_IPI_flags != 0);
                                         spin_lock(&part->IPI_lock);
                                         XPC_SET_IPI_FLAGS(part->local_IPI_amo,
-                                                        ch_number,
-                                                        XPC_IPI_CLOSEREQUEST);
+                                                          ch_number,
+                                                          XPC_IPI_CLOSEREQUEST);
                                         spin_unlock(&part->IPI_lock);
                                 }
                                 spin_unlock_irqrestore(&ch->lock, irq_flags);
@@ -937,7 +906,6 @@ again:
                 xpc_process_disconnect(ch, &irq_flags);
         }
 
-
         if (IPI_flags & XPC_IPI_CLOSEREPLY) {
 
                 dev_dbg(xpc_chan, "XPC_IPI_CLOSEREPLY received from partid=%d,"
@@ -953,12 +921,13 @@ again:
 
                 if (!(ch->flags & XPC_C_RCLOSEREQUEST)) {
                         if ((XPC_GET_IPI_FLAGS(part->local_IPI_amo, ch_number)
-                                                & XPC_IPI_CLOSEREQUEST)) {
+                             & XPC_IPI_CLOSEREQUEST)) {
 
                                 DBUG_ON(ch->delayed_IPI_flags != 0);
                                 spin_lock(&part->IPI_lock);
                                 XPC_SET_IPI_FLAGS(part->local_IPI_amo,
-                                                ch_number, XPC_IPI_CLOSEREPLY);
+                                                  ch_number,
+                                                  XPC_IPI_CLOSEREPLY);
                                 spin_unlock(&part->IPI_lock);
                         }
                         spin_unlock_irqrestore(&ch->lock, irq_flags);
@@ -973,7 +942,6 @@ again:
                 }
         }
 
-
         if (IPI_flags & XPC_IPI_OPENREQUEST) {
 
                 dev_dbg(xpc_chan, "XPC_IPI_OPENREQUEST (msg_size=%d, "
@@ -982,7 +950,7 @@ again:
                         ch->partid, ch->number);
 
                 if (part->act_state == XPC_P_DEACTIVATING ||
-                                        (ch->flags & XPC_C_ROPENREQUEST)) {
+                    (ch->flags & XPC_C_ROPENREQUEST)) {
                         spin_unlock_irqrestore(&ch->lock, irq_flags);
                         return;
                 }
@@ -993,9 +961,9 @@ again:
                         return;
                 }
                 DBUG_ON(!(ch->flags & (XPC_C_DISCONNECTED |
-                                                        XPC_C_OPENREQUEST)));
+                                       XPC_C_OPENREQUEST)));
                 DBUG_ON(ch->flags & (XPC_C_ROPENREQUEST | XPC_C_ROPENREPLY |
-                                        XPC_C_OPENREPLY | XPC_C_CONNECTED));
+                                     XPC_C_OPENREPLY | XPC_C_CONNECTED));
 
                 /*
                  * The meaningful OPENREQUEST connection state fields are:
@@ -1011,11 +979,10 @@ again:
                 ch->flags |= (XPC_C_ROPENREQUEST | XPC_C_CONNECTING);
                 ch->remote_nentries = args->local_nentries;
 
-
                 if (ch->flags & XPC_C_OPENREQUEST) {
                         if (args->msg_size != ch->msg_size) {
                                 XPC_DISCONNECT_CHANNEL(ch, xpcUnequalMsgSizes,
-                                                                &irq_flags);
+                                                       &irq_flags);
                                 spin_unlock_irqrestore(&ch->lock, irq_flags);
                                 return;
                         }
@@ -1031,7 +998,6 @@ again:
                 xpc_process_connect(ch, &irq_flags);
         }
 
-
         if (IPI_flags & XPC_IPI_OPENREPLY) {
 
                 dev_dbg(xpc_chan, "XPC_IPI_OPENREPLY (local_msgqueue_pa=0x%lx, "
@@ -1046,7 +1012,7 @@ again:
                 }
                 if (!(ch->flags & XPC_C_OPENREQUEST)) {
                         XPC_DISCONNECT_CHANNEL(ch, xpcOpenCloseError,
-                                                                &irq_flags);
+                                               &irq_flags);
                         spin_unlock_irqrestore(&ch->lock, irq_flags);
                         return;
                 }
@@ -1057,7 +1023,7 @@ again:
                 /*
                  * The meaningful OPENREPLY connection state fields are:
                  *      local_msgqueue_pa = physical address of remote
-                 *                          partition's local_msgqueue
+                 *                          partition's local_msgqueue
                  *      local_nentries = remote partition's local_nentries
                  *      remote_nentries = remote partition's remote_nentries
                  */
@@ -1093,7 +1059,6 @@ again:
         spin_unlock_irqrestore(&ch->lock, irq_flags);
 }
 
-
 /*
  * Attempt to establish a channel connection to a remote partition.
  */
@@ -1103,7 +1068,6 @@ xpc_connect_channel(struct xpc_channel *ch)
         unsigned long irq_flags;
         struct xpc_registration *registration = &xpc_registrations[ch->number];
 
-
         if (mutex_trylock(&registration->mutex) == 0) {
                 return xpcRetry;
         }
@@ -1124,7 +1088,6 @@ xpc_connect_channel(struct xpc_channel *ch)
                 return ch->reason;
         }
 
-
         /* add info from the channel connect registration to the channel */
 
         ch->kthreads_assigned_limit = registration->assigned_limit;
@@ -1154,7 +1117,7 @@ xpc_connect_channel(struct xpc_channel *ch)
                          */
                         mutex_unlock(&registration->mutex);
                         XPC_DISCONNECT_CHANNEL(ch, xpcUnequalMsgSizes,
-                                                                &irq_flags);
+                                               &irq_flags);
                         spin_unlock_irqrestore(&ch->lock, irq_flags);
                         return xpcUnequalMsgSizes;
                 }
@@ -1169,7 +1132,6 @@ xpc_connect_channel(struct xpc_channel *ch)
 
         mutex_unlock(&registration->mutex);
 
-
         /* initiate the connection */
 
         ch->flags |= (XPC_C_OPENREQUEST | XPC_C_CONNECTING);
@@ -1182,7 +1144,6 @@ xpc_connect_channel(struct xpc_channel *ch)
         return xpcSuccess;
 }
 
-
 /*
  * Clear some of the msg flags in the local message queue.
  */
@@ -1192,16 +1153,15 @@ xpc_clear_local_msgqueue_flags(struct xpc_channel *ch)
         struct xpc_msg *msg;
         s64 get;
 
-
         get = ch->w_remote_GP.get;
         do {
-                msg = (struct xpc_msg *) ((u64) ch->local_msgqueue +
-                                (get % ch->local_nentries) * ch->msg_size);
+                msg = (struct xpc_msg *)((u64)ch->local_msgqueue +
+                                         (get % ch->local_nentries) *
+                                         ch->msg_size);
                 msg->flags = 0;
-        } while (++get < (volatile s64) ch->remote_GP.get);
+        } while (++get < (volatile s64)ch->remote_GP.get);
 }
 
-
 /*
  * Clear some of the msg flags in the remote message queue.
  */
@@ -1211,43 +1171,39 @@ xpc_clear_remote_msgqueue_flags(struct xpc_channel *ch)
         struct xpc_msg *msg;
         s64 put;
 
-
         put = ch->w_remote_GP.put;
         do {
-                msg = (struct xpc_msg *) ((u64) ch->remote_msgqueue +
-                                (put % ch->remote_nentries) * ch->msg_size);
+                msg = (struct xpc_msg *)((u64)ch->remote_msgqueue +
+                                         (put % ch->remote_nentries) *
+                                         ch->msg_size);
                 msg->flags = 0;
-        } while (++put < (volatile s64) ch->remote_GP.put);
+        } while (++put < (volatile s64)ch->remote_GP.put);
 }
 
-
 static void
 xpc_process_msg_IPI(struct xpc_partition *part, int ch_number)
 {
         struct xpc_channel *ch = &part->channels[ch_number];
         int nmsgs_sent;
 
-
         ch->remote_GP = part->remote_GPs[ch_number];
 
-
         /* See what, if anything, has changed for each connected channel */
 
         xpc_msgqueue_ref(ch);
 
         if (ch->w_remote_GP.get == ch->remote_GP.get &&
-                                ch->w_remote_GP.put == ch->remote_GP.put) {
+            ch->w_remote_GP.put == ch->remote_GP.put) {
                 /* nothing changed since GPs were last pulled */
                 xpc_msgqueue_deref(ch);
                 return;
         }
 
-        if (!(ch->flags & XPC_C_CONNECTED)){
+        if (!(ch->flags & XPC_C_CONNECTED)) {
                 xpc_msgqueue_deref(ch);
                 return;
         }
 
-
         /*
          * First check to see if messages recently sent by us have been
          * received by the other side. (The remote GET value will have
@@ -1269,7 +1225,7 @@ xpc_process_msg_IPI(struct xpc_partition *part, int ch_number)
                          * received and delivered by the other side.
                          */
                         xpc_notify_senders(ch, xpcMsgDelivered,
-                                                        ch->remote_GP.get);
+                                           ch->remote_GP.get);
                 }
 
                 /*
@@ -1293,7 +1249,6 @@ xpc_process_msg_IPI(struct xpc_partition *part, int ch_number)
                 }
         }
 
-
         /*
          * Now check for newly sent messages by the other side. (The remote
          * PUT value will have changed since we last looked at it.)
@@ -1327,7 +1282,6 @@ xpc_process_msg_IPI(struct xpc_partition *part, int ch_number)
         xpc_msgqueue_deref(ch);
 }
 
-
 void
 xpc_process_channel_activity(struct xpc_partition *part)
 {
@@ -1337,7 +1291,6 @@ xpc_process_channel_activity(struct xpc_partition *part)
         int ch_number;
         u32 ch_flags;
 
-
         IPI_amo = xpc_get_IPI_flags(part);
 
         /*
@@ -1350,7 +1303,6 @@ xpc_process_channel_activity(struct xpc_partition *part)
         for (ch_number = 0; ch_number < part->nchannels; ch_number++) {
                 ch = &part->channels[ch_number];
 
-
                 /*
                  * Process any open or close related IPI flags, and then deal
                  * with connecting or disconnecting the channel as required.
@@ -1378,7 +1330,7 @@ xpc_process_channel_activity(struct xpc_partition *part)
                 if (!(ch_flags & XPC_C_CONNECTED)) {
                         if (!(ch_flags & XPC_C_OPENREQUEST)) {
                                 DBUG_ON(ch_flags & XPC_C_SETUP);
-                                (void) xpc_connect_channel(ch);
+                                (void)xpc_connect_channel(ch);
                         } else {
                                 spin_lock_irqsave(&ch->lock, irq_flags);
                                 xpc_process_connect(ch, &irq_flags);
@@ -1387,7 +1339,6 @@ xpc_process_channel_activity(struct xpc_partition *part)
                         continue;
                 }
 
-
                 /*
                  * Process any message related IPI flags, this may involve the
                  * activation of kthreads to deliver any pending messages sent
@@ -1400,7 +1351,6 @@ xpc_process_channel_activity(struct xpc_partition *part)
         }
 }
 
-
 /*
  * XPC's heartbeat code calls this function to inform XPC that a partition is
  * going down.  XPC responds by tearing down the XPartition Communication
@@ -1417,7 +1367,6 @@ xpc_partition_going_down(struct xpc_partition *part, enum xpc_retval reason)
         int ch_number;
         struct xpc_channel *ch;
 
-
         dev_dbg(xpc_chan, "deactivating partition %d, reason=%d\n",
                 XPC_PARTID(part), reason);
 
@@ -1426,7 +1375,6 @@ xpc_partition_going_down(struct xpc_partition *part, enum xpc_retval reason)
                 return;
         }
 
-
         /* disconnect channels associated with the partition going down */
 
         for (ch_number = 0; ch_number < part->nchannels; ch_number++) {
@@ -1446,7 +1394,6 @@ xpc_partition_going_down(struct xpc_partition *part, enum xpc_retval reason)
         xpc_part_deref(part);
 }
 
-
 /*
  * Teardown the infrastructure necessary to support XPartition Communication
  * between the specified remote partition and the local one.
@@ -1456,7 +1403,6 @@ xpc_teardown_infrastructure(struct xpc_partition *part)
 {
         partid_t partid = XPC_PARTID(part);
 
-
         /*
          * We start off by making this partition inaccessible to local
          * processes by marking it as no longer setup. Then we make it
@@ -1473,9 +1419,7 @@ xpc_teardown_infrastructure(struct xpc_partition *part)
 
         xpc_vars_part[partid].magic = 0;
 
-
-        free_irq(SGI_XPC_NOTIFY, (void *) (u64) partid);
-
+        free_irq(SGI_XPC_NOTIFY, (void *)(u64)partid);
 
         /*
          * Before proceeding with the teardown we have to wait until all
@@ -1483,7 +1427,6 @@ xpc_teardown_infrastructure(struct xpc_partition *part)
          */
         wait_event(part->teardown_wq, (atomic_read(&part->references) == 0));
 
-
         /* now we can begin tearing down the infrastructure */
 
         part->setup_state = XPC_P_TORNDOWN;
@@ -1504,7 +1447,6 @@ xpc_teardown_infrastructure(struct xpc_partition *part)
         part->local_IPI_amo_va = NULL;
 }
 
-
 /*
  * Called by XP at the time of channel connection registration to cause
  * XPC to establish connections to all currently active partitions.
@@ -1516,7 +1458,6 @@ xpc_initiate_connect(int ch_number)
         struct xpc_partition *part;
         struct xpc_channel *ch;
 
-
         DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS);
 
         for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) {
@@ -1535,7 +1476,6 @@ xpc_initiate_connect(int ch_number)
         }
 }
 
-
 void
 xpc_connected_callout(struct xpc_channel *ch)
 {
@@ -1546,14 +1486,13 @@ xpc_connected_callout(struct xpc_channel *ch)
                         "partid=%d, channel=%d\n", ch->partid, ch->number);
 
                 ch->func(xpcConnected, ch->partid, ch->number,
-                                (void *) (u64) ch->local_nentries, ch->key);
+                         (void *)(u64)ch->local_nentries, ch->key);
 
                 dev_dbg(xpc_chan, "ch->func() returned, reason=xpcConnected, "
                         "partid=%d, channel=%d\n", ch->partid, ch->number);
         }
 }
 
-
 /*
  * Called by XP at the time of channel connection unregistration to cause
  * XPC to teardown all current connections for the specified channel.
@@ -1575,7 +1514,6 @@ xpc_initiate_disconnect(int ch_number)
         struct xpc_partition *part;
         struct xpc_channel *ch;
 
-
         DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS);
 
         /* initiate the channel disconnect for every active partition */
@@ -1592,7 +1530,7 @@ xpc_initiate_disconnect(int ch_number)
                                 ch->flags |= XPC_C_WDISCONNECT;
 
                                 XPC_DISCONNECT_CHANNEL(ch, xpcUnregistering,
-                                                                &irq_flags);
+                                                       &irq_flags);
                         }
 
                         spin_unlock_irqrestore(&ch->lock, irq_flags);
@@ -1605,7 +1543,6 @@ xpc_initiate_disconnect(int ch_number)
         xpc_disconnect_wait(ch_number);
 }
 
-
 /*
  * To disconnect a channel, and reflect it back to all who may be waiting.
  *
@@ -1617,11 +1554,10 @@ xpc_initiate_disconnect(int ch_number)
  */
 void
 xpc_disconnect_channel(const int line, struct xpc_channel *ch,
-                        enum xpc_retval reason, unsigned long *irq_flags)
+                       enum xpc_retval reason, unsigned long *irq_flags)
 {
         u32 channel_was_connected = (ch->flags & XPC_C_CONNECTED);
 
-
         DBUG_ON(!spin_is_locked(&ch->lock));
 
         if (ch->flags & (XPC_C_DISCONNECTING | XPC_C_DISCONNECTED)) {
@@ -1637,8 +1573,8 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,
         ch->flags |= (XPC_C_CLOSEREQUEST | XPC_C_DISCONNECTING);
         /* some of these may not have been set */
         ch->flags &= ~(XPC_C_OPENREQUEST | XPC_C_OPENREPLY |
-                        XPC_C_ROPENREQUEST | XPC_C_ROPENREPLY |
-                        XPC_C_CONNECTING | XPC_C_CONNECTED);
+                       XPC_C_ROPENREQUEST | XPC_C_ROPENREPLY |
+                       XPC_C_CONNECTING | XPC_C_CONNECTED);
 
         xpc_IPI_send_closerequest(ch, irq_flags);
 
@@ -1653,7 +1589,7 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,
                 wake_up_all(&ch->idle_wq);
 
         } else if ((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
-                        !(ch->flags & XPC_C_DISCONNECTINGCALLOUT)) {
+                   !(ch->flags & XPC_C_DISCONNECTINGCALLOUT)) {
                 /* start a kthread that will do the xpcDisconnecting callout */
                 xpc_create_kthreads(ch, 1, 1);
         }
@@ -1666,7 +1602,6 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,
         spin_lock_irqsave(&ch->lock, *irq_flags);
 }
 
-
 void
 xpc_disconnect_callout(struct xpc_channel *ch, enum xpc_retval reason)
 {
@@ -1687,7 +1622,6 @@ xpc_disconnect_callout(struct xpc_channel *ch, enum xpc_retval reason)
         }
 }
 
-
 /*
  * Wait for a message entry to become available for the specified channel,
  * but don't wait any longer than 1 jiffy.
@@ -1697,9 +1631,8 @@ xpc_allocate_msg_wait(struct xpc_channel *ch)
 {
         enum xpc_retval ret;
 
-
         if (ch->flags & XPC_C_DISCONNECTING) {
-                DBUG_ON(ch->reason == xpcInterrupted);  // >>> Is this true?
+                DBUG_ON(ch->reason == xpcInterrupted);  // >>> Is this true?
                 return ch->reason;
         }
 
@@ -1709,7 +1642,7 @@ xpc_allocate_msg_wait(struct xpc_channel *ch)
 
         if (ch->flags & XPC_C_DISCONNECTING) {
                 ret = ch->reason;
-                DBUG_ON(ch->reason == xpcInterrupted);  // >>> Is this true?
+                DBUG_ON(ch->reason == xpcInterrupted);  // >>> Is this true?
         } else if (ret == 0) {
                 ret = xpcTimeout;
         } else {
@@ -1719,20 +1652,18 @@ xpc_allocate_msg_wait(struct xpc_channel *ch)
         return ret;
 }
 
-
 /*
  * Allocate an entry for a message from the message queue associated with the
  * specified channel.
  */
 static enum xpc_retval
 xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
-                        struct xpc_msg **address_of_msg)
+                 struct xpc_msg **address_of_msg)
 {
         struct xpc_msg *msg;
         enum xpc_retval ret;
         s64 put;
 
-
         /* this reference will be dropped in xpc_send_msg() */
         xpc_msgqueue_ref(ch);
 
@@ -1745,7 +1676,6 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
                 return xpcNotConnected;
         }
 
-
         /*
          * Get the next available message entry from the local message queue.
          * If none are available, we'll make sure that we grab the latest
@@ -1755,25 +1685,23 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
 
         while (1) {
 
-                put = (volatile s64) ch->w_local_GP.put;
-                if (put - (volatile s64) ch->w_remote_GP.get <
-                                                        ch->local_nentries) {
+                put = (volatile s64)ch->w_local_GP.put;
+                if (put - (volatile s64)ch->w_remote_GP.get <
+                    ch->local_nentries) {
 
                         /* There are available message entries. We need to try
                          * to secure one for ourselves. We'll do this by trying
                          * to increment w_local_GP.put as long as someone else
                          * doesn't beat us to it. If they do, we'll have to
                          * try again.
-                         */
-                        if (cmpxchg(&ch->w_local_GP.put, put, put + 1) ==
-                                                                        put) {
+                         */
+                        if (cmpxchg(&ch->w_local_GP.put, put, put + 1) == put) {
                                 /* we got the entry referenced by put */
                                 break;
                         }
                         continue;       /* try again */
                 }
 
-
                 /*
                  * There aren't any available msg entries at this time.
                  *
@@ -1799,25 +1727,22 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
                 }
         }
 
-
         /* get the message's address and initialize it */
-        msg = (struct xpc_msg *) ((u64) ch->local_msgqueue +
-                                (put % ch->local_nentries) * ch->msg_size);
-
+        msg = (struct xpc_msg *)((u64)ch->local_msgqueue +
+                                 (put % ch->local_nentries) * ch->msg_size);
 
         DBUG_ON(msg->flags != 0);
         msg->number = put;
 
         dev_dbg(xpc_chan, "w_local_GP.put changed to %ld; msg=0x%p, "
                 "msg_number=%ld, partid=%d, channel=%d\n", put + 1,
-                (void *) msg, msg->number, ch->partid, ch->number);
+                (void *)msg, msg->number, ch->partid, ch->number);
 
         *address_of_msg = msg;
 
         return xpcSuccess;
 }
 
-
 /*
  * Allocate an entry for a message from the message queue associated with the
  * specified channel. NOTE that this routine can sleep waiting for a message
@@ -1838,7 +1763,6 @@ xpc_initiate_allocate(partid_t partid, int ch_number, u32 flags, void **payload)
         enum xpc_retval ret = xpcUnknownReason;
         struct xpc_msg *msg = NULL;
 
-
         DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
         DBUG_ON(ch_number < 0 || ch_number >= part->nchannels);
 
@@ -1856,7 +1780,6 @@ xpc_initiate_allocate(partid_t partid, int ch_number, u32 flags, void **payload)
         return ret;
 }
 
-
 /*
  * Now we actually send the messages that are ready to be sent by advancing
  * the local message queue's Put value and then send an IPI to the recipient
@@ -1869,16 +1792,16 @@ xpc_send_msgs(struct xpc_channel *ch, s64 initial_put)
         s64 put = initial_put + 1;
         int send_IPI = 0;
 
-
         while (1) {
 
                 while (1) {
-                        if (put == (volatile s64) ch->w_local_GP.put) {
+                        if (put == (volatile s64)ch->w_local_GP.put) {
                                 break;
                         }
 
-                        msg = (struct xpc_msg *) ((u64) ch->local_msgqueue +
-                               (put % ch->local_nentries) * ch->msg_size);
+                        msg = (struct xpc_msg *)((u64)ch->local_msgqueue +
+                                                 (put % ch->local_nentries) *
+                                                 ch->msg_size);
 
                         if (!(msg->flags & XPC_M_READY)) {
                                 break;
@@ -1893,9 +1816,9 @@ xpc_send_msgs(struct xpc_channel *ch, s64 initial_put)
                 }
 
                 if (cmpxchg_rel(&ch->local_GP->put, initial_put, put) !=
-                                                                initial_put) {
+                    initial_put) {
                         /* someone else beat us to it */
-                        DBUG_ON((volatile s64) ch->local_GP->put < initial_put);
+                        DBUG_ON((volatile s64)ch->local_GP->put < initial_put);
                         break;
                 }
 
@@ -1919,7 +1842,6 @@ xpc_send_msgs(struct xpc_channel *ch, s64 initial_put)
         }
 }
 
-
 /*
  * Common code that does the actual sending of the message by advancing the
  * local message queue's Put value and sends an IPI to the partition the
@@ -1927,16 +1849,15 @@ xpc_send_msgs(struct xpc_channel *ch, s64 initial_put)
  */
 static enum xpc_retval
 xpc_send_msg(struct xpc_channel *ch, struct xpc_msg *msg, u8 notify_type,
-                        xpc_notify_func func, void *key)
+             xpc_notify_func func, void *key)
 {
         enum xpc_retval ret = xpcSuccess;
         struct xpc_notify *notify = notify;
         s64 put, msg_number = msg->number;
 
-
         DBUG_ON(notify_type == XPC_N_CALL && func == NULL);
-        DBUG_ON((((u64) msg - (u64) ch->local_msgqueue) / ch->msg_size) !=
-                                        msg_number % ch->local_nentries);
+        DBUG_ON((((u64)msg - (u64)ch->local_msgqueue) / ch->msg_size) !=
+                msg_number % ch->local_nentries);
         DBUG_ON(msg->flags & XPC_M_READY);
 
         if (ch->flags & XPC_C_DISCONNECTING) {
@@ -1970,7 +1891,7 @@ xpc_send_msg(struct xpc_channel *ch, struct xpc_msg *msg, u8 notify_type,
                          * the notify entry.
                          */
                         if (cmpxchg(&notify->type, notify_type, 0) ==
-                                                                notify_type) {
+                            notify_type) {
                                 atomic_dec(&ch->n_to_notify);
                                 ret = ch->reason;
                         }
@@ -2001,7 +1922,6 @@ xpc_send_msg(struct xpc_channel *ch, struct xpc_msg *msg, u8 notify_type,
         return ret;
 }
 
-
 /*
  * Send a message previously allocated using xpc_initiate_allocate() on the
  * specified channel connected to the specified partition.
@@ -2029,8 +1949,7 @@ xpc_initiate_send(partid_t partid, int ch_number, void *payload)
         struct xpc_msg *msg = XPC_MSG_ADDRESS(payload);
         enum xpc_retval ret;
 
-
-        dev_dbg(xpc_chan, "msg=0x%p, partid=%d, channel=%d\n", (void *) msg,
+        dev_dbg(xpc_chan, "msg=0x%p, partid=%d, channel=%d\n", (void *)msg,
                 partid, ch_number);
 
         DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
@@ -2042,7 +1961,6 @@ xpc_initiate_send(partid_t partid, int ch_number, void *payload)
         return ret;
 }
 
-
 /*
  * Send a message previously allocated using xpc_initiate_allocate on the
  * specified channel connected to the specified partition.
@@ -2075,14 +1993,13 @@ xpc_initiate_send(partid_t partid, int ch_number, void *payload)
  */
 enum xpc_retval
 xpc_initiate_send_notify(partid_t partid, int ch_number, void *payload,
-                                xpc_notify_func func, void *key)
+                         xpc_notify_func func, void *key)
 {
         struct xpc_partition *part = &xpc_partitions[partid];
         struct xpc_msg *msg = XPC_MSG_ADDRESS(payload);
         enum xpc_retval ret;
 
-
-        dev_dbg(xpc_chan, "msg=0x%p, partid=%d, channel=%d\n", (void *) msg,
+        dev_dbg(xpc_chan, "msg=0x%p, partid=%d, channel=%d\n", (void *)msg,
                 partid, ch_number);
 
         DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
@@ -2091,11 +2008,10 @@ xpc_initiate_send_notify(partid_t partid, int ch_number, void *payload,
         DBUG_ON(func == NULL);
 
         ret = xpc_send_msg(&part->channels[ch_number], msg, XPC_N_CALL,
-                                                                func, key);
+                           func, key);
         return ret;
 }
 
-
 static struct xpc_msg *
 xpc_pull_remote_msg(struct xpc_channel *ch, s64 get)
 {
@@ -2105,7 +2021,6 @@ xpc_pull_remote_msg(struct xpc_channel *ch, s64 get)
         u64 msg_offset;
         enum xpc_retval ret;
 
-
         if (mutex_lock_interruptible(&ch->msg_to_pull_mutex) != 0) {
                 /* we were interrupted by a signal */
                 return NULL;
@@ -2118,22 +2033,22 @@ xpc_pull_remote_msg(struct xpc_channel *ch, s64 get)
                 msg_index = ch->next_msg_to_pull % ch->remote_nentries;
 
                 DBUG_ON(ch->next_msg_to_pull >=
-                                        (volatile s64) ch->w_remote_GP.put);
-                nmsgs =  (volatile s64) ch->w_remote_GP.put -
-                                                ch->next_msg_to_pull;
+                        (volatile s64)ch->w_remote_GP.put);
+                nmsgs = (volatile s64)ch->w_remote_GP.put -
+                    ch->next_msg_to_pull;
                 if (msg_index + nmsgs > ch->remote_nentries) {
                         /* ignore the ones that wrap the msg queue for now */
                         nmsgs = ch->remote_nentries - msg_index;
                 }
 
                 msg_offset = msg_index * ch->msg_size;
-                msg = (struct xpc_msg *) ((u64) ch->remote_msgqueue +
-                                                                msg_offset);
-                remote_msg = (struct xpc_msg *) (ch->remote_msgqueue_pa +
-                                                                msg_offset);
+                msg = (struct xpc_msg *)((u64)ch->remote_msgqueue + msg_offset);
+                remote_msg = (struct xpc_msg *)(ch->remote_msgqueue_pa +
+                                                msg_offset);
 
                 if ((ret = xpc_pull_remote_cachelines(part, msg, remote_msg,
-                                nmsgs * ch->msg_size)) != xpcSuccess) {
+                                                      nmsgs * ch->msg_size)) !=
+                    xpcSuccess) {
 
                         dev_dbg(xpc_chan, "failed to pull %d msgs starting with"
                                 " msg %ld from partition %d, channel=%d, "
@@ -2146,7 +2061,7 @@ xpc_pull_remote_msg(struct xpc_channel *ch, s64 get)
                         return NULL;
                 }
 
-                mb();   /* >>> this may not be needed, we're not sure */
+                mb();           /* >>> this may not be needed, we're not sure */
 
                 ch->next_msg_to_pull += nmsgs;
         }
@@ -2155,12 +2070,11 @@ xpc_pull_remote_msg(struct xpc_channel *ch, s64 get)
 
         /* return the message we were looking for */
         msg_offset = (get % ch->remote_nentries) * ch->msg_size;
-        msg = (struct xpc_msg *) ((u64) ch->remote_msgqueue + msg_offset);
+        msg = (struct xpc_msg *)((u64)ch->remote_msgqueue + msg_offset);
 
         return msg;
 }
 
-
 /*
  * Get a message to be delivered.
  */
@@ -2170,14 +2084,13 @@ xpc_get_deliverable_msg(struct xpc_channel *ch)
         struct xpc_msg *msg = NULL;
         s64 get;
 
-
         do {
-                if ((volatile u32) ch->flags & XPC_C_DISCONNECTING) {
+                if ((volatile u32)ch->flags & XPC_C_DISCONNECTING) {
                         break;
                 }
 
-                get = (volatile s64) ch->w_local_GP.get;
-                if (get == (volatile s64) ch->w_remote_GP.put) {
+                get = (volatile s64)ch->w_local_GP.get;
+                if (get == (volatile s64)ch->w_remote_GP.put) {
                         break;
                 }
 
@@ -2186,7 +2099,7 @@ xpc_get_deliverable_msg(struct xpc_channel *ch)
                  * by trying to increment w_local_GP.get and hope that no one
                  * else beats us to it. If they do, we'll we'll simply have
                  * to try again for the next one.
-                 */
+                 */
 
                 if (cmpxchg(&ch->w_local_GP.get, get, get + 1) == get) {
                         /* we got the entry referenced by get */
@@ -2211,7 +2124,6 @@ xpc_get_deliverable_msg(struct xpc_channel *ch)
         return msg;
 }
 
-
 /*
  * Deliver a message to its intended recipient.
  */
@@ -2220,7 +2132,6 @@ xpc_deliver_msg(struct xpc_channel *ch)
 {
         struct xpc_msg *msg;
 
-
         if ((msg = xpc_get_deliverable_msg(ch)) != NULL) {
 
                 /*
@@ -2235,16 +2146,16 @@ xpc_deliver_msg(struct xpc_channel *ch)
                 if (ch->func != NULL) {
                         dev_dbg(xpc_chan, "ch->func() called, msg=0x%p, "
                                 "msg_number=%ld, partid=%d, channel=%d\n",
-                                (void *) msg, msg->number, ch->partid,
+                                (void *)msg, msg->number, ch->partid,
                                 ch->number);
 
                         /* deliver the message to its intended recipient */
                         ch->func(xpcMsgReceived, ch->partid, ch->number,
-                                        &msg->payload, ch->key);
+                                 &msg->payload, ch->key);
 
                         dev_dbg(xpc_chan, "ch->func() returned, msg=0x%p, "
                                 "msg_number=%ld, partid=%d, channel=%d\n",
-                                (void *) msg, msg->number, ch->partid,
+                                (void *)msg, msg->number, ch->partid,
                                 ch->number);
                 }
 
@@ -2252,7 +2163,6 @@ xpc_deliver_msg(struct xpc_channel *ch)
         }
 }
 
-
 /*
  * Now we actually acknowledge the messages that have been delivered and ack'd
  * by advancing the cached remote message queue's Get value and if requested
@@ -2265,16 +2175,16 @@ xpc_acknowledge_msgs(struct xpc_channel *ch, s64 initial_get, u8 msg_flags)
         s64 get = initial_get + 1;
         int send_IPI = 0;
 
-
         while (1) {
 
                 while (1) {
-                        if (get == (volatile s64) ch->w_local_GP.get) {
+                        if (get == (volatile s64)ch->w_local_GP.get) {
                                 break;
                         }
 
-                        msg = (struct xpc_msg *) ((u64) ch->remote_msgqueue +
-                               (get % ch->remote_nentries) * ch->msg_size);
+                        msg = (struct xpc_msg *)((u64)ch->remote_msgqueue +
+                                                 (get % ch->remote_nentries) *
+                                                 ch->msg_size);
 
                         if (!(msg->flags & XPC_M_DONE)) {
                                 break;
@@ -2290,10 +2200,9 @@ xpc_acknowledge_msgs(struct xpc_channel *ch, s64 initial_get, u8 msg_flags)
                 }
 
                 if (cmpxchg_rel(&ch->local_GP->get, initial_get, get) !=
-                                                                initial_get) {
+                    initial_get) {
                         /* someone else beat us to it */
-                        DBUG_ON((volatile s64) ch->local_GP->get <=
-                                                                initial_get);
+                        DBUG_ON((volatile s64)ch->local_GP->get <= initial_get);
                         break;
                 }
 
@@ -2317,7 +2226,6 @@ xpc_acknowledge_msgs(struct xpc_channel *ch, s64 initial_get, u8 msg_flags)
         }
 }
 
-
 /*
  * Acknowledge receipt of a delivered message.
  *
@@ -2343,17 +2251,16 @@ xpc_initiate_received(partid_t partid, int ch_number, void *payload)
         struct xpc_msg *msg = XPC_MSG_ADDRESS(payload);
         s64 get, msg_number = msg->number;
 
-
         DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
         DBUG_ON(ch_number < 0 || ch_number >= part->nchannels);
 
         ch = &part->channels[ch_number];
 
         dev_dbg(xpc_chan, "msg=0x%p, msg_number=%ld, partid=%d, channel=%d\n",
-                (void *) msg, msg_number, ch->partid, ch->number);
+                (void *)msg, msg_number, ch->partid, ch->number);
 
-        DBUG_ON((((u64) msg - (u64) ch->remote_msgqueue) / ch->msg_size) !=
-                                        msg_number % ch->remote_nentries);
+        DBUG_ON((((u64)msg - (u64)ch->remote_msgqueue) / ch->msg_size) !=
+                msg_number % ch->remote_nentries);
         DBUG_ON(msg->flags & XPC_M_DONE);
 
         msg->flags |= XPC_M_DONE;
@@ -2376,4 +2283,3 @@ xpc_initiate_received(partid_t partid, int ch_number, void *payload)
         /* the call to xpc_msgqueue_ref() was done by xpc_deliver_msg()  */
         xpc_msgqueue_deref(ch);
 }
-