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

Ran patches through scripts/Lindent (part 1).

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

1 files changed, 185 insertions, 257 deletions

diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
index 14e70ee53ebe..64368bb88890 100644
--- a/drivers/misc/sgi-xp/xpc.h
+++ b/drivers/misc/sgi-xp/xpc.h
@@ -6,7 +6,6 @@
  * Copyright (c) 2004-2008 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
-
 /*
  * Cross Partition Communication (XPC) structures and macros.
  */
@@ -14,7 +13,6 @@
 #ifndef _DRIVERS_MISC_SGIXP_XPC_H
 #define _DRIVERS_MISC_SGIXP_XPC_H
 
-
 #include <linux/interrupt.h>
 #include <linux/sysctl.h>
 #include <linux/device.h>
@@ -29,7 +27,6 @@
 #include <asm/sn/shub_mmr.h>
 #include "xp.h"
 
-
 /*
  * XPC Version numbers consist of a major and minor number. XPC can always
  * talk to versions with same major #, and never talk to versions with a
@@ -39,7 +36,6 @@
 #define XPC_VERSION_MAJOR(_v)           ((_v) >> 4)
 #define XPC_VERSION_MINOR(_v)           ((_v) & 0xf)
 
-
 /*
  * The next macros define word or bit representations for given
  * C-brick nasid in either the SAL provided bit array representing
@@ -67,7 +63,6 @@
 /* define the process name of the discovery thread */
 #define XPC_DISCOVERY_THREAD_NAME       "xpc_discovery"
 
-
 /*
  * the reserved page
  *
@@ -121,7 +116,7 @@ struct xpc_rsvd_page {
         u64 nasids_size;        /* SAL: size of each nasid mask in bytes */
 };
 
-#define XPC_RP_VERSION _XPC_VERSION(1,1) /* version 1.1 of the reserved page */
+#define XPC_RP_VERSION _XPC_VERSION(1,1)        /* version 1.1 of the reserved page */
 
 #define XPC_SUPPORTS_RP_STAMP(_version) \
                         (_version >= _XPC_VERSION(1,1))
@@ -138,14 +133,12 @@ xpc_compare_stamps(struct timespec *stamp1, struct timespec *stamp2)
 {
         int ret;
 
-
         if ((ret = stamp1->tv_sec - stamp2->tv_sec) == 0) {
                 ret = stamp1->tv_nsec - stamp2->tv_nsec;
         }
         return ret;
 }
 
-
 /*
  * Define the structures by which XPC variables can be exported to other
  * partitions. (There are two: struct xpc_vars and struct xpc_vars_part)
@@ -172,12 +165,11 @@ struct xpc_vars {
         AMO_t *amos_page;       /* vaddr of page of AMOs from MSPEC driver */
 };
 
-#define XPC_V_VERSION _XPC_VERSION(3,1) /* version 3.1 of the cross vars */
+#define XPC_V_VERSION _XPC_VERSION(3,1) /* version 3.1 of the cross vars */
 
 #define XPC_SUPPORTS_DISENGAGE_REQUEST(_version) \
                         (_version >= _XPC_VERSION(3,1))
 
-
 static inline int
 xpc_hb_allowed(partid_t partid, struct xpc_vars *vars)
 {
@@ -193,7 +185,7 @@ xpc_allow_hb(partid_t partid, struct xpc_vars *vars)
                 old_mask = vars->heartbeating_to_mask;
                 new_mask = (old_mask | (1UL << partid));
         } while (cmpxchg(&vars->heartbeating_to_mask, old_mask, new_mask) !=
-                                                        old_mask);
+                 old_mask);
 }
 
 static inline void
@@ -205,10 +197,9 @@ xpc_disallow_hb(partid_t partid, struct xpc_vars *vars)
                 old_mask = vars->heartbeating_to_mask;
                 new_mask = (old_mask & ~(1UL << partid));
         } while (cmpxchg(&vars->heartbeating_to_mask, old_mask, new_mask) !=
-                                                        old_mask);
+                 old_mask);
 }
 
-
 /*
  * The AMOs page consists of a number of AMO variables which are divided into
  * four groups, The first two groups are used to identify an IRQ's sender.
@@ -222,7 +213,6 @@ xpc_disallow_hb(partid_t partid, struct xpc_vars *vars)
 #define XPC_ENGAGED_PARTITIONS_AMO (XPC_ACTIVATE_IRQ_AMOS + XP_NASID_MASK_WORDS)
 #define XPC_DISENGAGE_REQUEST_AMO  (XPC_ENGAGED_PARTITIONS_AMO + 1)
 
-
 /*
  * The following structure describes the per partition specific variables.
  *
@@ -257,9 +247,8 @@ struct xpc_vars_part {
  * MAGIC2 indicates that this partition has pulled the remote partititions
  * per partition variables that pertain to this partition.
  */
-#define XPC_VP_MAGIC1   0x0053524156435058L  /* 'XPCVARS\0'L (little endian) */
-#define XPC_VP_MAGIC2   0x0073726176435058L  /* 'XPCvars\0'L (little endian) */
-
+#define XPC_VP_MAGIC1   0x0053524156435058L     /* 'XPCVARS\0'L (little endian) */
+#define XPC_VP_MAGIC2   0x0073726176435058L     /* 'XPCvars\0'L (little endian) */
 
 /* the reserved page sizes and offsets */
 
@@ -271,7 +260,6 @@ struct xpc_vars_part {
 #define XPC_RP_VARS(_rp)        ((struct xpc_vars *) XPC_RP_MACH_NASIDS(_rp) + xp_nasid_mask_words)
 #define XPC_RP_VARS_PART(_rp)   (struct xpc_vars_part *) ((u8 *) XPC_RP_VARS(rp) + XPC_RP_VARS_SIZE)
 
-
 /*
  * Functions registered by add_timer() or called by kernel_thread() only
  * allow for a single 64-bit argument. The following macros can be used to
@@ -285,8 +273,6 @@ struct xpc_vars_part {
 #define XPC_UNPACK_ARG1(_args)  (((u64) _args) & 0xffffffff)
 #define XPC_UNPACK_ARG2(_args)  ((((u64) _args) >> 32) & 0xffffffff)
 
-
-
 /*
  * Define a Get/Put value pair (pointers) used with a message queue.
  */
@@ -298,8 +284,6 @@ struct xpc_gp {
 #define XPC_GP_SIZE \
                 L1_CACHE_ALIGN(sizeof(struct xpc_gp) * XPC_NCHANNELS)
 
-
-
 /*
  * Define a structure that contains arguments associated with opening and
  * closing a channel.
@@ -315,20 +299,15 @@ struct xpc_openclose_args {
 #define XPC_OPENCLOSE_ARGS_SIZE \
               L1_CACHE_ALIGN(sizeof(struct xpc_openclose_args) * XPC_NCHANNELS)
 
-
-
 /* struct xpc_msg flags */
 
 #define XPC_M_DONE              0x01    /* msg has been received/consumed */
 #define XPC_M_READY             0x02    /* msg is ready to be sent */
 #define XPC_M_INTERRUPT         0x04    /* send interrupt when msg consumed */
 
-
 #define XPC_MSG_ADDRESS(_payload) \
                 ((struct xpc_msg *)((u8 *)(_payload) - XPC_MSG_PAYLOAD_OFFSET))
 
-
-
 /*
  * Defines notify entry.
  *
@@ -336,19 +315,17 @@ struct xpc_openclose_args {
  * and consumed by the intended recipient.
  */
 struct xpc_notify {
-        volatile u8 type;               /* type of notification */
+        volatile u8 type;       /* type of notification */
 
         /* the following two fields are only used if type == XPC_N_CALL */
-        xpc_notify_func func;           /* user's notify function */
-        void *key;                      /* pointer to user's key */
+        xpc_notify_func func;   /* user's notify function */
+        void *key;              /* pointer to user's key */
 };
 
 /* struct xpc_notify type of notification */
 
 #define XPC_N_CALL              0x01    /* notify function provided by user */
 
-
-
 /*
  * Define the structure that manages all the stuff required by a channel. In
  * particular, they are used to manage the messages sent across the channel.
@@ -428,48 +405,48 @@ struct xpc_notify {
  *      messages.
  */
 struct xpc_channel {
-        partid_t partid;                /* ID of remote partition connected */
-        spinlock_t lock;                /* lock for updating this structure */
-        u32 flags;                      /* general flags */
+        partid_t partid;        /* ID of remote partition connected */
+        spinlock_t lock;        /* lock for updating this structure */
+        u32 flags;              /* general flags */
 
-        enum xpc_retval reason;         /* reason why channel is disconnect'g */
-        int reason_line;                /* line# disconnect initiated from */
+        enum xpc_retval reason; /* reason why channel is disconnect'g */
+        int reason_line;        /* line# disconnect initiated from */
 
-        u16 number;                     /* channel # */
+        u16 number;             /* channel # */
 
-        u16 msg_size;                   /* sizeof each msg entry */
-        u16 local_nentries;             /* #of msg entries in local msg queue */
-        u16 remote_nentries;            /* #of msg entries in remote msg queue*/
+        u16 msg_size;           /* sizeof each msg entry */
+        u16 local_nentries;     /* #of msg entries in local msg queue */
+        u16 remote_nentries;    /* #of msg entries in remote msg queue */
 
         void *local_msgqueue_base;      /* base address of kmalloc'd space */
         struct xpc_msg *local_msgqueue; /* local message queue */
         void *remote_msgqueue_base;     /* base address of kmalloc'd space */
-        struct xpc_msg *remote_msgqueue;/* cached copy of remote partition's */
-                                        /* local message queue */
-        u64 remote_msgqueue_pa;         /* phys addr of remote partition's */
-                                        /* local message queue */
+        struct xpc_msg *remote_msgqueue;        /* cached copy of remote partition's */
+                                                /* local message queue */
+        u64 remote_msgqueue_pa; /* phys addr of remote partition's */
+                                /* local message queue */
 
-        atomic_t references;            /* #of external references to queues */
+        atomic_t references;    /* #of external references to queues */
 
-        atomic_t n_on_msg_allocate_wq;   /* #on msg allocation wait queue */
-        wait_queue_head_t msg_allocate_wq; /* msg allocation wait queue */
+        atomic_t n_on_msg_allocate_wq;  /* #on msg allocation wait queue */
+        wait_queue_head_t msg_allocate_wq;      /* msg allocation wait queue */
 
-        u8 delayed_IPI_flags;           /* IPI flags received, but delayed */
-                                        /* action until channel disconnected */
+        u8 delayed_IPI_flags;   /* IPI flags received, but delayed */
+                                /* action until channel disconnected */
 
         /* queue of msg senders who want to be notified when msg received */
 
-        atomic_t n_to_notify;           /* #of msg senders to notify */
-        struct xpc_notify *notify_queue;/* notify queue for messages sent */
+        atomic_t n_to_notify;   /* #of msg senders to notify */
+        struct xpc_notify *notify_queue;        /* notify queue for messages sent */
 
-        xpc_channel_func func;          /* user's channel function */
-        void *key;                      /* pointer to user's key */
+        xpc_channel_func func;  /* user's channel function */
+        void *key;              /* pointer to user's key */
 
         struct mutex msg_to_pull_mutex; /* next msg to pull serialization */
-        struct completion wdisconnect_wait; /* wait for channel disconnect */
+        struct completion wdisconnect_wait;     /* wait for channel disconnect */
 
-        struct xpc_openclose_args *local_openclose_args; /* args passed on */
-                                        /* opening or closing of channel */
+        struct xpc_openclose_args *local_openclose_args;        /* args passed on */
+                                                                /* opening or closing of channel */
 
         /* various flavors of local and remote Get/Put values */
 
@@ -477,7 +454,7 @@ struct xpc_channel {
         struct xpc_gp remote_GP;        /* remote Get/Put values */
         struct xpc_gp w_local_GP;       /* working local Get/Put values */
         struct xpc_gp w_remote_GP;      /* working remote Get/Put values */
-        s64 next_msg_to_pull;           /* Put value of next msg to pull */
+        s64 next_msg_to_pull;   /* Put value of next msg to pull */
 
         /* kthread management related fields */
 
@@ -485,48 +462,45 @@ struct xpc_channel {
 // >>> allow the assigned limit be unbounded and let the idle limit be dynamic
 // >>> dependent on activity over the last interval of time
         atomic_t kthreads_assigned;     /* #of kthreads assigned to channel */
-        u32 kthreads_assigned_limit;    /* limit on #of kthreads assigned */
-        atomic_t kthreads_idle;         /* #of kthreads idle waiting for work */
+        u32 kthreads_assigned_limit;    /* limit on #of kthreads assigned */
+        atomic_t kthreads_idle; /* #of kthreads idle waiting for work */
         u32 kthreads_idle_limit;        /* limit on #of kthreads idle */
         atomic_t kthreads_active;       /* #of kthreads actively working */
         // >>> following field is temporary
-        u32 kthreads_created;           /* total #of kthreads created */
+        u32 kthreads_created;   /* total #of kthreads created */
 
         wait_queue_head_t idle_wq;      /* idle kthread wait queue */
 
 } ____cacheline_aligned;
 
-
 /* struct xpc_channel flags */
 
-#define XPC_C_WASCONNECTED      0x00000001 /* channel was connected */
+#define XPC_C_WASCONNECTED      0x00000001      /* channel was connected */
 
-#define XPC_C_ROPENREPLY        0x00000002 /* remote open channel reply */
-#define XPC_C_OPENREPLY         0x00000004 /* local open channel reply */
-#define XPC_C_ROPENREQUEST      0x00000008 /* remote open channel request */
-#define XPC_C_OPENREQUEST       0x00000010 /* local open channel request */
+#define XPC_C_ROPENREPLY        0x00000002      /* remote open channel reply */
+#define XPC_C_OPENREPLY         0x00000004      /* local open channel reply */
+#define XPC_C_ROPENREQUEST      0x00000008      /* remote open channel request */
+#define XPC_C_OPENREQUEST       0x00000010      /* local open channel request */
 
-#define XPC_C_SETUP             0x00000020 /* channel's msgqueues are alloc'd */
-#define XPC_C_CONNECTEDCALLOUT  0x00000040 /* connected callout initiated */
+#define XPC_C_SETUP             0x00000020      /* channel's msgqueues are alloc'd */
+#define XPC_C_CONNECTEDCALLOUT  0x00000040      /* connected callout initiated */
 #define XPC_C_CONNECTEDCALLOUT_MADE \
-                                0x00000080 /* connected callout completed */
-#define XPC_C_CONNECTED         0x00000100 /* local channel is connected */
-#define XPC_C_CONNECTING        0x00000200 /* channel is being connected */
+                                0x00000080      /* connected callout completed */
+#define XPC_C_CONNECTED         0x00000100      /* local channel is connected */
+#define XPC_C_CONNECTING        0x00000200      /* channel is being connected */
 
-#define XPC_C_RCLOSEREPLY       0x00000400 /* remote close channel reply */
-#define XPC_C_CLOSEREPLY        0x00000800 /* local close channel reply */
-#define XPC_C_RCLOSEREQUEST     0x00001000 /* remote close channel request */
-#define XPC_C_CLOSEREQUEST      0x00002000 /* local close channel request */
+#define XPC_C_RCLOSEREPLY       0x00000400      /* remote close channel reply */
+#define XPC_C_CLOSEREPLY        0x00000800      /* local close channel reply */
+#define XPC_C_RCLOSEREQUEST     0x00001000      /* remote close channel request */
+#define XPC_C_CLOSEREQUEST      0x00002000      /* local close channel request */
 
-#define XPC_C_DISCONNECTED      0x00004000 /* channel is disconnected */
-#define XPC_C_DISCONNECTING     0x00008000 /* channel is being disconnected */
+#define XPC_C_DISCONNECTED      0x00004000      /* channel is disconnected */
+#define XPC_C_DISCONNECTING     0x00008000      /* channel is being disconnected */
 #define XPC_C_DISCONNECTINGCALLOUT \
-                                0x00010000 /* disconnecting callout initiated */
+                                0x00010000      /* disconnecting callout initiated */
 #define XPC_C_DISCONNECTINGCALLOUT_MADE \
-                                0x00020000 /* disconnecting callout completed */
-#define XPC_C_WDISCONNECT       0x00040000 /* waiting for channel disconnect */
-
-
+                                0x00020000      /* disconnecting callout completed */
+#define XPC_C_WDISCONNECT       0x00040000      /* waiting for channel disconnect */
 
 /*
  * Manages channels on a partition basis. There is one of these structures
@@ -537,33 +511,31 @@ struct xpc_partition {
 
         /* XPC HB infrastructure */
 
-        u8 remote_rp_version;           /* version# of partition's rsvd pg */
-        struct timespec remote_rp_stamp;/* time when rsvd pg was initialized */
-        u64 remote_rp_pa;               /* phys addr of partition's rsvd pg */
-        u64 remote_vars_pa;             /* phys addr of partition's vars */
+        u8 remote_rp_version;   /* version# of partition's rsvd pg */
+        struct timespec remote_rp_stamp;        /* time when rsvd pg was initialized */
+        u64 remote_rp_pa;       /* phys addr of partition's rsvd pg */
+        u64 remote_vars_pa;     /* phys addr of partition's vars */
         u64 remote_vars_part_pa;        /* phys addr of partition's vars part */
-        u64 last_heartbeat;             /* HB at last read */
+        u64 last_heartbeat;     /* HB at last read */
         u64 remote_amos_page_pa;        /* phys addr of partition's amos page */
-        int remote_act_nasid;           /* active part's act/deact nasid */
+        int remote_act_nasid;   /* active part's act/deact nasid */
         int remote_act_phys_cpuid;      /* active part's act/deact phys cpuid */
-        u32 act_IRQ_rcvd;               /* IRQs since activation */
-        spinlock_t act_lock;            /* protect updating of act_state */
-        u8 act_state;                   /* from XPC HB viewpoint */
-        u8 remote_vars_version;         /* version# of partition's vars */
-        enum xpc_retval reason;         /* reason partition is deactivating */
-        int reason_line;                /* line# deactivation initiated from */
-        int reactivate_nasid;           /* nasid in partition to reactivate */
-
-        unsigned long disengage_request_timeout; /* timeout in jiffies */
+        u32 act_IRQ_rcvd;       /* IRQs since activation */
+        spinlock_t act_lock;    /* protect updating of act_state */
+        u8 act_state;           /* from XPC HB viewpoint */
+        u8 remote_vars_version; /* version# of partition's vars */
+        enum xpc_retval reason; /* reason partition is deactivating */
+        int reason_line;        /* line# deactivation initiated from */
+        int reactivate_nasid;   /* nasid in partition to reactivate */
+
+        unsigned long disengage_request_timeout;        /* timeout in jiffies */
         struct timer_list disengage_request_timer;
 
-
         /* XPC infrastructure referencing and teardown control */
 
         volatile u8 setup_state;        /* infrastructure setup state */
         wait_queue_head_t teardown_wq;  /* kthread waiting to teardown infra */
-        atomic_t references;            /* #of references to infrastructure */
-
+        atomic_t references;    /* #of references to infrastructure */
 
         /*
          * NONE OF THE PRECEDING FIELDS OF THIS STRUCTURE WILL BE CLEARED WHEN
@@ -572,53 +544,48 @@ struct xpc_partition {
          * 'nchannels' FIELD MUST BE THE FIRST OF THE FIELDS TO BE CLEARED.)
          */
 
-
-        u8 nchannels;              /* #of defined channels supported */
-        atomic_t nchannels_active; /* #of channels that are not DISCONNECTED */
-        atomic_t nchannels_engaged;/* #of channels engaged with remote part */
-        struct xpc_channel *channels;/* array of channel structures */
-
-        void *local_GPs_base;     /* base address of kmalloc'd space */
-        struct xpc_gp *local_GPs; /* local Get/Put values */
-        void *remote_GPs_base;    /* base address of kmalloc'd space */
-        struct xpc_gp *remote_GPs;/* copy of remote partition's local Get/Put */
-                                  /* values */
-        u64 remote_GPs_pa;        /* phys address of remote partition's local */
-                                  /* Get/Put values */
-
+        u8 nchannels;           /* #of defined channels supported */
+        atomic_t nchannels_active;      /* #of channels that are not DISCONNECTED */
+        atomic_t nchannels_engaged;     /* #of channels engaged with remote part */
+        struct xpc_channel *channels;   /* array of channel structures */
+
+        void *local_GPs_base;   /* base address of kmalloc'd space */
+        struct xpc_gp *local_GPs;       /* local Get/Put values */
+        void *remote_GPs_base;  /* base address of kmalloc'd space */
+        struct xpc_gp *remote_GPs;      /* copy of remote partition's local Get/Put */
+                                        /* values */
+        u64 remote_GPs_pa;      /* phys address of remote partition's local */
+                                /* Get/Put values */
 
         /* fields used to pass args when opening or closing a channel */
 
-        void *local_openclose_args_base;  /* base address of kmalloc'd space */
-        struct xpc_openclose_args *local_openclose_args;  /* local's args */
-        void *remote_openclose_args_base; /* base address of kmalloc'd space */
-        struct xpc_openclose_args *remote_openclose_args; /* copy of remote's */
-                                          /* args */
-        u64 remote_openclose_args_pa;     /* phys addr of remote's args */
-
+        void *local_openclose_args_base;        /* base address of kmalloc'd space */
+        struct xpc_openclose_args *local_openclose_args;        /* local's args */
+        void *remote_openclose_args_base;       /* base address of kmalloc'd space */
+        struct xpc_openclose_args *remote_openclose_args;       /* copy of remote's */
+                                                                /* args */
+        u64 remote_openclose_args_pa;   /* phys addr of remote's args */
 
         /* IPI sending, receiving and handling related fields */
 
-        int remote_IPI_nasid;       /* nasid of where to send IPIs */
-        int remote_IPI_phys_cpuid;  /* phys CPU ID of where to send IPIs */
-        AMO_t *remote_IPI_amo_va;   /* address of remote IPI AMO_t structure */
+        int remote_IPI_nasid;   /* nasid of where to send IPIs */
+        int remote_IPI_phys_cpuid;      /* phys CPU ID of where to send IPIs */
+        AMO_t *remote_IPI_amo_va;       /* address of remote IPI AMO_t structure */
 
-        AMO_t *local_IPI_amo_va;    /* address of IPI AMO_t structure */
-        u64 local_IPI_amo;          /* IPI amo flags yet to be handled */
-        char IPI_owner[8];          /* IPI owner's name */
-        struct timer_list dropped_IPI_timer; /* dropped IPI timer */
-
-        spinlock_t IPI_lock;        /* IPI handler lock */
+        AMO_t *local_IPI_amo_va;        /* address of IPI AMO_t structure */
+        u64 local_IPI_amo;      /* IPI amo flags yet to be handled */
+        char IPI_owner[8];      /* IPI owner's name */
+        struct timer_list dropped_IPI_timer;    /* dropped IPI timer */
 
+        spinlock_t IPI_lock;    /* IPI handler lock */
 
         /* channel manager related fields */
 
         atomic_t channel_mgr_requests;  /* #of requests to activate chan mgr */
-        wait_queue_head_t channel_mgr_wq; /* channel mgr's wait queue */
+        wait_queue_head_t channel_mgr_wq;       /* channel mgr's wait queue */
 
 } ____cacheline_aligned;
 
-
 /* struct xpc_partition act_state values (for XPC HB) */
 
 #define XPC_P_INACTIVE          0x00    /* partition is not active */
@@ -627,11 +594,9 @@ struct xpc_partition {
 #define XPC_P_ACTIVE            0x03    /* xpc_partition_up() was called */
 #define XPC_P_DEACTIVATING      0x04    /* partition deactivation initiated */
 
-
 #define XPC_DEACTIVATE_PARTITION(_p, _reason) \
                         xpc_deactivate_partition(__LINE__, (_p), (_reason))
 
-
 /* struct xpc_partition setup_state values */
 
 #define XPC_P_UNSET             0x00    /* infrastructure was never setup */
@@ -639,8 +604,6 @@ struct xpc_partition {
 #define XPC_P_WTEARDOWN         0x02    /* waiting to teardown infrastructure */
 #define XPC_P_TORNDOWN          0x03    /* infrastructure is torndown */
 
-
-
 /*
  * struct xpc_partition IPI_timer #of seconds to wait before checking for
  * dropped IPIs. These occur whenever an IPI amo write doesn't complete until
@@ -648,22 +611,17 @@ struct xpc_partition {
  */
 #define XPC_P_DROPPED_IPI_WAIT  (0.25 * HZ)
 
-
 /* number of seconds to wait for other partitions to disengage */
 #define XPC_DISENGAGE_REQUEST_DEFAULT_TIMELIMIT 90
 
 /* interval in seconds to print 'waiting disengagement' messages */
 #define XPC_DISENGAGE_PRINTMSG_INTERVAL         10
 
-
 #define XPC_PARTID(_p)  ((partid_t) ((_p) - &xpc_partitions[0]))
 
-
-
 /* found in xp_main.c */
 extern struct xpc_registration xpc_registrations[];
 
-
 /* found in xpc_main.c */
 extern struct device *xpc_part;
 extern struct device *xpc_chan;
@@ -676,7 +634,6 @@ extern void xpc_activate_kthreads(struct xpc_channel *, int);
 extern void xpc_create_kthreads(struct xpc_channel *, int, int);
 extern void xpc_disconnect_wait(int);
 
-
 /* found in xpc_partition.c */
 extern int xpc_exiting;
 extern struct xpc_vars *xpc_vars;
@@ -696,10 +653,9 @@ extern void xpc_mark_partition_inactive(struct xpc_partition *);
 extern void xpc_discovery(void);
 extern void xpc_check_remote_hb(void);
 extern void xpc_deactivate_partition(const int, struct xpc_partition *,
-                                                enum xpc_retval);
+                                     enum xpc_retval);
 extern enum xpc_retval xpc_initiate_partid_to_nasids(partid_t, void *);
 
-
 /* found in xpc_channel.c */
 extern void xpc_initiate_connect(int);
 extern void xpc_initiate_disconnect(int);
@@ -714,13 +670,11 @@ extern void xpc_process_channel_activity(struct xpc_partition *);
 extern void xpc_connected_callout(struct xpc_channel *);
 extern void xpc_deliver_msg(struct xpc_channel *);
 extern void xpc_disconnect_channel(const int, struct xpc_channel *,
-                                        enum xpc_retval, unsigned long *);
+                                   enum xpc_retval, unsigned long *);
 extern void xpc_disconnect_callout(struct xpc_channel *, enum xpc_retval);
 extern void xpc_partition_going_down(struct xpc_partition *, enum xpc_retval);
 extern void xpc_teardown_infrastructure(struct xpc_partition *);
 
-
-
 static inline void
 xpc_wakeup_channel_mgr(struct xpc_partition *part)
 {
@@ -729,8 +683,6 @@ xpc_wakeup_channel_mgr(struct xpc_partition *part)
         }
 }
 
-
-
 /*
  * These next two inlines are used to keep us from tearing down a channel's
  * msg queues while a thread may be referencing them.
@@ -752,12 +704,9 @@ xpc_msgqueue_deref(struct xpc_channel *ch)
         }
 }
 
-
-
 #define XPC_DISCONNECT_CHANNEL(_ch, _reason, _irqflgs) \
                 xpc_disconnect_channel(__LINE__, _ch, _reason, _irqflgs)
 
-
 /*
  * These two inlines are used to keep us from tearing down a partition's
  * setup infrastructure while a thread may be referencing it.
@@ -767,7 +716,6 @@ xpc_part_deref(struct xpc_partition *part)
 {
         s32 refs = atomic_dec_return(&part->references);
 
-
         DBUG_ON(refs < 0);
         if (refs == 0 && part->setup_state == XPC_P_WTEARDOWN) {
                 wake_up(&part->teardown_wq);
@@ -779,7 +727,6 @@ xpc_part_ref(struct xpc_partition *part)
 {
         int setup;
 
-
         atomic_inc(&part->references);
         setup = (part->setup_state == XPC_P_SETUP);
         if (!setup) {
@@ -788,8 +735,6 @@ xpc_part_ref(struct xpc_partition *part)
         return setup;
 }
 
-
-
 /*
  * The following macro is to be used for the setting of the reason and
  * reason_line fields in both the struct xpc_channel and struct xpc_partition
@@ -801,8 +746,6 @@ xpc_part_ref(struct xpc_partition *part)
                 (_p)->reason_line = _line; \
         }
 
-
-
 /*
  * This next set of inlines are used to keep track of when a partition is
  * potentially engaged in accessing memory belonging to another partition.
@@ -812,23 +755,24 @@ static inline void
 xpc_mark_partition_engaged(struct xpc_partition *part)
 {
         unsigned long irq_flags;
-        AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa +
-                                (XPC_ENGAGED_PARTITIONS_AMO * sizeof(AMO_t)));
-
+        AMO_t *amo = (AMO_t *)__va(part->remote_amos_page_pa +
+                                   (XPC_ENGAGED_PARTITIONS_AMO *
+                                    sizeof(AMO_t)));
 
         local_irq_save(irq_flags);
 
         /* set bit corresponding to our partid in remote partition's AMO */
-        FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_OR,
-                                                (1UL << sn_partition_id));
+        FETCHOP_STORE_OP(TO_AMO((u64)&amo->variable), FETCHOP_OR,
+                         (1UL << sn_partition_id));
         /*
          * We must always use the nofault function regardless of whether we
          * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we
          * didn't, we'd never know that the other partition is down and would
          * keep sending IPIs and AMOs to it until the heartbeat times out.
          */
-        (void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo->
-                                variable), xp_nofault_PIOR_target));
+        (void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amo->
+                                                               variable),
+                                                     xp_nofault_PIOR_target));
 
         local_irq_restore(irq_flags);
 }
@@ -837,23 +781,24 @@ static inline void
 xpc_mark_partition_disengaged(struct xpc_partition *part)
 {
         unsigned long irq_flags;
-        AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa +
-                                (XPC_ENGAGED_PARTITIONS_AMO * sizeof(AMO_t)));
-
+        AMO_t *amo = (AMO_t *)__va(part->remote_amos_page_pa +
+                                   (XPC_ENGAGED_PARTITIONS_AMO *
+                                    sizeof(AMO_t)));
 
         local_irq_save(irq_flags);
 
         /* clear bit corresponding to our partid in remote partition's AMO */
-        FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND,
-                                                ~(1UL << sn_partition_id));
+        FETCHOP_STORE_OP(TO_AMO((u64)&amo->variable), FETCHOP_AND,
+                         ~(1UL << sn_partition_id));
         /*
          * We must always use the nofault function regardless of whether we
          * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we
          * didn't, we'd never know that the other partition is down and would
          * keep sending IPIs and AMOs to it until the heartbeat times out.
          */
-        (void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo->
-                                variable), xp_nofault_PIOR_target));
+        (void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amo->
+                                                               variable),
+                                                     xp_nofault_PIOR_target));
 
         local_irq_restore(irq_flags);
 }
@@ -862,23 +807,23 @@ static inline void
 xpc_request_partition_disengage(struct xpc_partition *part)
 {
         unsigned long irq_flags;
-        AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa +
-                                (XPC_DISENGAGE_REQUEST_AMO * sizeof(AMO_t)));
-
+        AMO_t *amo = (AMO_t *)__va(part->remote_amos_page_pa +
+                                   (XPC_DISENGAGE_REQUEST_AMO * sizeof(AMO_t)));
 
         local_irq_save(irq_flags);
 
         /* set bit corresponding to our partid in remote partition's AMO */
-        FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_OR,
-                                                (1UL << sn_partition_id));
+        FETCHOP_STORE_OP(TO_AMO((u64)&amo->variable), FETCHOP_OR,
+                         (1UL << sn_partition_id));
         /*
          * We must always use the nofault function regardless of whether we
          * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we
          * didn't, we'd never know that the other partition is down and would
          * keep sending IPIs and AMOs to it until the heartbeat times out.
          */
-        (void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo->
-                                variable), xp_nofault_PIOR_target));
+        (void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amo->
+                                                               variable),
+                                                     xp_nofault_PIOR_target));
 
         local_irq_restore(irq_flags);
 }
@@ -887,23 +832,23 @@ static inline void
 xpc_cancel_partition_disengage_request(struct xpc_partition *part)
 {
         unsigned long irq_flags;
-        AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa +
-                                (XPC_DISENGAGE_REQUEST_AMO * sizeof(AMO_t)));
-
+        AMO_t *amo = (AMO_t *)__va(part->remote_amos_page_pa +
+                                   (XPC_DISENGAGE_REQUEST_AMO * sizeof(AMO_t)));
 
         local_irq_save(irq_flags);
 
         /* clear bit corresponding to our partid in remote partition's AMO */
-        FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND,
-                                                ~(1UL << sn_partition_id));
+        FETCHOP_STORE_OP(TO_AMO((u64)&amo->variable), FETCHOP_AND,
+                         ~(1UL << sn_partition_id));
         /*
          * We must always use the nofault function regardless of whether we
          * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we
          * didn't, we'd never know that the other partition is down and would
          * keep sending IPIs and AMOs to it until the heartbeat times out.
          */
-        (void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo->
-                                variable), xp_nofault_PIOR_target));
+        (void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amo->
+                                                               variable),
+                                                     xp_nofault_PIOR_target));
 
         local_irq_restore(irq_flags);
 }
@@ -913,10 +858,9 @@ xpc_partition_engaged(u64 partid_mask)
 {
         AMO_t *amo = xpc_vars->amos_page + XPC_ENGAGED_PARTITIONS_AMO;
 
-
         /* return our partition's AMO variable ANDed with partid_mask */
-        return (FETCHOP_LOAD_OP(TO_AMO((u64) &amo->variable), FETCHOP_LOAD) &
-                                                                partid_mask);
+        return (FETCHOP_LOAD_OP(TO_AMO((u64)&amo->variable), FETCHOP_LOAD) &
+                partid_mask);
 }
 
 static inline u64
@@ -924,10 +868,9 @@ xpc_partition_disengage_requested(u64 partid_mask)
 {
         AMO_t *amo = xpc_vars->amos_page + XPC_DISENGAGE_REQUEST_AMO;
 
-
         /* return our partition's AMO variable ANDed with partid_mask */
-        return (FETCHOP_LOAD_OP(TO_AMO((u64) &amo->variable), FETCHOP_LOAD) &
-                                                                partid_mask);
+        return (FETCHOP_LOAD_OP(TO_AMO((u64)&amo->variable), FETCHOP_LOAD) &
+                partid_mask);
 }
 
 static inline void
@@ -935,10 +878,9 @@ xpc_clear_partition_engaged(u64 partid_mask)
 {
         AMO_t *amo = xpc_vars->amos_page + XPC_ENGAGED_PARTITIONS_AMO;
 
-
         /* clear bit(s) based on partid_mask in our partition's AMO */
-        FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND,
-                                                                ~partid_mask);
+        FETCHOP_STORE_OP(TO_AMO((u64)&amo->variable), FETCHOP_AND,
+                         ~partid_mask);
 }
 
 static inline void
@@ -946,14 +888,11 @@ xpc_clear_partition_disengage_request(u64 partid_mask)
 {
         AMO_t *amo = xpc_vars->amos_page + XPC_DISENGAGE_REQUEST_AMO;
 
-
         /* clear bit(s) based on partid_mask in our partition's AMO */
-        FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND,
-                                                                ~partid_mask);
+        FETCHOP_STORE_OP(TO_AMO((u64)&amo->variable), FETCHOP_AND,
+                         ~partid_mask);
 }
 
-
-
 /*
  * The following set of macros and inlines are used for the sending and
  * receiving of IPIs (also known as IRQs). There are two flavors of IPIs,
@@ -964,20 +903,18 @@ xpc_clear_partition_disengage_request(u64 partid_mask)
 static inline u64
 xpc_IPI_receive(AMO_t *amo)
 {
-        return FETCHOP_LOAD_OP(TO_AMO((u64) &amo->variable), FETCHOP_CLEAR);
+        return FETCHOP_LOAD_OP(TO_AMO((u64)&amo->variable), FETCHOP_CLEAR);
 }
 
-
 static inline enum xpc_retval
 xpc_IPI_send(AMO_t *amo, u64 flag, int nasid, int phys_cpuid, int vector)
 {
         int ret = 0;
         unsigned long irq_flags;
 
-
         local_irq_save(irq_flags);
 
-        FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_OR, flag);
+        FETCHOP_STORE_OP(TO_AMO((u64)&amo->variable), FETCHOP_OR, flag);
         sn_send_IPI_phys(nasid, phys_cpuid, vector, 0);
 
         /*
@@ -986,15 +923,14 @@ xpc_IPI_send(AMO_t *amo, u64 flag, int nasid, int phys_cpuid, int vector)
          * didn't, we'd never know that the other partition is down and would
          * keep sending IPIs and AMOs to it until the heartbeat times out.
          */
-        ret = xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo->variable),
-                                xp_nofault_PIOR_target));
+        ret = xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amo->variable),
+                                                     xp_nofault_PIOR_target));
 
         local_irq_restore(irq_flags);
 
         return ((ret == 0) ? xpcSuccess : xpcPioReadError);
 }
 
-
 /*
  * IPIs associated with SGI_XPC_ACTIVATE IRQ.
  */
@@ -1004,47 +940,47 @@ xpc_IPI_send(AMO_t *amo, u64 flag, int nasid, int phys_cpuid, int vector)
  */
 static inline void
 xpc_activate_IRQ_send(u64 amos_page_pa, int from_nasid, int to_nasid,
-                        int to_phys_cpuid)
+                      int to_phys_cpuid)
 {
         int w_index = XPC_NASID_W_INDEX(from_nasid);
         int b_index = XPC_NASID_B_INDEX(from_nasid);
-        AMO_t *amos = (AMO_t *) __va(amos_page_pa +
-                                (XPC_ACTIVATE_IRQ_AMOS * sizeof(AMO_t)));
-
+        AMO_t *amos = (AMO_t *)__va(amos_page_pa +
+                                    (XPC_ACTIVATE_IRQ_AMOS * sizeof(AMO_t)));
 
-        (void) xpc_IPI_send(&amos[w_index], (1UL << b_index), to_nasid,
-                                to_phys_cpuid, SGI_XPC_ACTIVATE);
+        (void)xpc_IPI_send(&amos[w_index], (1UL << b_index), to_nasid,
+                           to_phys_cpuid, SGI_XPC_ACTIVATE);
 }
 
 static inline void
 xpc_IPI_send_activate(struct xpc_vars *vars)
 {
         xpc_activate_IRQ_send(vars->amos_page_pa, cnodeid_to_nasid(0),
-                                vars->act_nasid, vars->act_phys_cpuid);
+                              vars->act_nasid, vars->act_phys_cpuid);
 }
 
 static inline void
 xpc_IPI_send_activated(struct xpc_partition *part)
 {
         xpc_activate_IRQ_send(part->remote_amos_page_pa, cnodeid_to_nasid(0),
-                        part->remote_act_nasid, part->remote_act_phys_cpuid);
+                              part->remote_act_nasid,
+                              part->remote_act_phys_cpuid);
 }
 
 static inline void
 xpc_IPI_send_reactivate(struct xpc_partition *part)
 {
         xpc_activate_IRQ_send(xpc_vars->amos_page_pa, part->reactivate_nasid,
-                                xpc_vars->act_nasid, xpc_vars->act_phys_cpuid);
+                              xpc_vars->act_nasid, xpc_vars->act_phys_cpuid);
 }
 
 static inline void
 xpc_IPI_send_disengage(struct xpc_partition *part)
 {
         xpc_activate_IRQ_send(part->remote_amos_page_pa, cnodeid_to_nasid(0),
-                        part->remote_act_nasid, part->remote_act_phys_cpuid);
+                              part->remote_act_nasid,
+                              part->remote_act_phys_cpuid);
 }
 
-
 /*
  * IPIs associated with SGI_XPC_NOTIFY IRQ.
  */
@@ -1058,18 +994,16 @@ xpc_IPI_send_disengage(struct xpc_partition *part)
 
 static inline void
 xpc_notify_IRQ_send(struct xpc_channel *ch, u8 ipi_flag, char *ipi_flag_string,
-                        unsigned long *irq_flags)
+                    unsigned long *irq_flags)
 {
         struct xpc_partition *part = &xpc_partitions[ch->partid];
         enum xpc_retval ret;
 
-
         if (likely(part->act_state != XPC_P_DEACTIVATING)) {
                 ret = xpc_IPI_send(part->remote_IPI_amo_va,
-                                        (u64) ipi_flag << (ch->number * 8),
-                                        part->remote_IPI_nasid,
-                                        part->remote_IPI_phys_cpuid,
-                                        SGI_XPC_NOTIFY);
+                                   (u64)ipi_flag << (ch->number * 8),
+                                   part->remote_IPI_nasid,
+                                   part->remote_IPI_phys_cpuid, SGI_XPC_NOTIFY);
                 dev_dbg(xpc_chan, "%s sent to partid=%d, channel=%d, ret=%d\n",
                         ipi_flag_string, ch->partid, ch->number, ret);
                 if (unlikely(ret != xpcSuccess)) {
@@ -1084,7 +1018,6 @@ xpc_notify_IRQ_send(struct xpc_channel *ch, u8 ipi_flag, char *ipi_flag_string,
         }
 }
 
-
 /*
  * Make it look like the remote partition, which is associated with the
  * specified channel, sent us an IPI. This faked IPI will be handled
@@ -1095,18 +1028,16 @@ xpc_notify_IRQ_send(struct xpc_channel *ch, u8 ipi_flag, char *ipi_flag_string,
 
 static inline void
 xpc_notify_IRQ_send_local(struct xpc_channel *ch, u8 ipi_flag,
-                                char *ipi_flag_string)
+                          char *ipi_flag_string)
 {
         struct xpc_partition *part = &xpc_partitions[ch->partid];
 
-
-        FETCHOP_STORE_OP(TO_AMO((u64) &part->local_IPI_amo_va->variable),
-                        FETCHOP_OR, ((u64) ipi_flag << (ch->number * 8)));
+        FETCHOP_STORE_OP(TO_AMO((u64)&part->local_IPI_amo_va->variable),
+                         FETCHOP_OR, ((u64)ipi_flag << (ch->number * 8)));
         dev_dbg(xpc_chan, "%s sent local from partid=%d, channel=%d\n",
                 ipi_flag_string, ch->partid, ch->number);
 }
 
-
 /*
  * The sending and receiving of IPIs includes the setting of an AMO variable
  * to indicate the reason the IPI was sent. The 64-bit variable is divided
@@ -1121,7 +1052,6 @@ xpc_notify_IRQ_send_local(struct xpc_channel *ch, u8 ipi_flag,
 #define XPC_IPI_OPENREPLY       0x08
 #define XPC_IPI_MSGREQUEST      0x10
 
-
 /* given an AMO variable and a channel#, get its associated IPI flags */
 #define XPC_GET_IPI_FLAGS(_amo, _c)     ((u8) (((_amo) >> ((_c) * 8)) & 0xff))
 #define XPC_SET_IPI_FLAGS(_amo, _c, _f) (_amo) |= ((u64) (_f) << ((_c) * 8))
@@ -1129,13 +1059,11 @@ xpc_notify_IRQ_send_local(struct xpc_channel *ch, u8 ipi_flag,
 #define XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(_amo) ((_amo) & __IA64_UL_CONST(0x0f0f0f0f0f0f0f0f))
 #define XPC_ANY_MSG_IPI_FLAGS_SET(_amo)       ((_amo) & __IA64_UL_CONST(0x1010101010101010))
 
-
 static inline void
 xpc_IPI_send_closerequest(struct xpc_channel *ch, unsigned long *irq_flags)
 {
         struct xpc_openclose_args *args = ch->local_openclose_args;
 
-
         args->reason = ch->reason;
 
         XPC_NOTIFY_IRQ_SEND(ch, XPC_IPI_CLOSEREQUEST, irq_flags);
@@ -1152,7 +1080,6 @@ xpc_IPI_send_openrequest(struct xpc_channel *ch, unsigned long *irq_flags)
 {
         struct xpc_openclose_args *args = ch->local_openclose_args;
 
-
         args->msg_size = ch->msg_size;
         args->local_nentries = ch->local_nentries;
 
@@ -1164,7 +1091,6 @@ xpc_IPI_send_openreply(struct xpc_channel *ch, unsigned long *irq_flags)
 {
         struct xpc_openclose_args *args = ch->local_openclose_args;
 
-
         args->remote_nentries = ch->remote_nentries;
         args->local_nentries = ch->local_nentries;
         args->local_msgqueue_pa = __pa(ch->local_msgqueue);
@@ -1184,7 +1110,6 @@ xpc_IPI_send_local_msgrequest(struct xpc_channel *ch)
         XPC_NOTIFY_IRQ_SEND_LOCAL(ch, XPC_IPI_MSGREQUEST);
 }
 
-
 /*
  * Memory for XPC's AMO variables is allocated by the MSPEC driver. These
  * pages are located in the lowest granule. The lowest granule uses 4k pages
@@ -1201,13 +1126,10 @@ xpc_IPI_init(int index)
 {
         AMO_t *amo = xpc_vars->amos_page + index;
 
-
-        (void) xpc_IPI_receive(amo);    /* clear AMO variable */
+        (void)xpc_IPI_receive(amo);     /* clear AMO variable */
         return amo;
 }
 
-
-
 static inline enum xpc_retval
 xpc_map_bte_errors(bte_result_t error)
 {
@@ -1220,22 +1142,31 @@ xpc_map_bte_errors(bte_result_t error)
                 return xpcBteUnmappedError;
         }
         switch (error) {
-        case BTE_SUCCESS:       return xpcSuccess;
-        case BTEFAIL_DIR:       return xpcBteDirectoryError;
-        case BTEFAIL_POISON:    return xpcBtePoisonError;
-        case BTEFAIL_WERR:      return xpcBteWriteError;
-        case BTEFAIL_ACCESS:    return xpcBteAccessError;
-        case BTEFAIL_PWERR:     return xpcBtePWriteError;
-        case BTEFAIL_PRERR:     return xpcBtePReadError;
-        case BTEFAIL_TOUT:      return xpcBteTimeOutError;
-        case BTEFAIL_XTERR:     return xpcBteXtalkError;
-        case BTEFAIL_NOTAVAIL:  return xpcBteNotAvailable;
-        default:                return xpcBteUnmappedError;
+        case BTE_SUCCESS:
+                return xpcSuccess;
+        case BTEFAIL_DIR:
+                return xpcBteDirectoryError;
+        case BTEFAIL_POISON:
+                return xpcBtePoisonError;
+        case BTEFAIL_WERR:
+                return xpcBteWriteError;
+        case BTEFAIL_ACCESS:
+                return xpcBteAccessError;
+        case BTEFAIL_PWERR:
+                return xpcBtePWriteError;
+        case BTEFAIL_PRERR:
+                return xpcBtePReadError;
+        case BTEFAIL_TOUT:
+                return xpcBteTimeOutError;
+        case BTEFAIL_XTERR:
+                return xpcBteXtalkError;
+        case BTEFAIL_NOTAVAIL:
+                return xpcBteNotAvailable;
+        default:
+                return xpcBteUnmappedError;
         }
 }
 
-
-
 /*
  * Check to see if there is any channel activity to/from the specified
  * partition.
@@ -1246,7 +1177,6 @@ xpc_check_for_channel_activity(struct xpc_partition *part)
         u64 IPI_amo;
         unsigned long irq_flags;
 
-
         IPI_amo = xpc_IPI_receive(part->local_IPI_amo_va);
         if (IPI_amo == 0) {
                 return;
@@ -1262,6 +1192,4 @@ xpc_check_for_channel_activity(struct xpc_partition *part)
         xpc_wakeup_channel_mgr(part);
 }
 
-
 #endif /* _DRIVERS_MISC_SGIXP_XPC_H */
-