[IA64] run drivers/misc/sgi-xp through scripts/checkpatch.pl

Addressed issues raised by scripts/checkpatch.pl. Removed unnecessary curly
braces. Eliminated uses of volatiles and use of kernel_thread() and daemonize().

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

1 files changed, 58 insertions, 66 deletions

diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
index 64368bb88890..9eb6d4a3269c 100644
--- a/drivers/misc/sgi-xp/xpc.h
+++ b/drivers/misc/sgi-xp/xpc.h
@@ -110,16 +110,16 @@ struct xpc_rsvd_page {
         u8 partid;              /* SAL: partition ID */
         u8 version;
         u8 pad1[6];             /* align to next u64 in cacheline */
-        volatile u64 vars_pa;
+        u64 vars_pa;            /* physical address of struct xpc_vars */
         struct timespec stamp;  /* time when reserved page was setup by XPC */
         u64 pad2[9];            /* align to last u64 in cacheline */
         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))
+                        (_version >= _XPC_VERSION(1, 1))
 
 /*
  * compare stamps - the return value is:
@@ -133,9 +133,10 @@ xpc_compare_stamps(struct timespec *stamp1, struct timespec *stamp2)
 {
         int ret;
 
-        if ((ret = stamp1->tv_sec - stamp2->tv_sec) == 0) {
+        ret = stamp1->tv_sec - stamp2->tv_sec;
+        if (ret == 0)
                 ret = stamp1->tv_nsec - stamp2->tv_nsec;
-        }
+
         return ret;
 }
 
@@ -165,10 +166,10 @@ 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))
+                        (_version >= _XPC_VERSION(3, 1))
 
 static inline int
 xpc_hb_allowed(partid_t partid, struct xpc_vars *vars)
@@ -224,7 +225,7 @@ xpc_disallow_hb(partid_t partid, struct xpc_vars *vars)
  * occupies half a cacheline.
  */
 struct xpc_vars_part {
-        volatile u64 magic;
+        u64 magic;
 
         u64 openclose_args_pa;  /* physical address of open and close args */
         u64 GPs_pa;             /* physical address of Get/Put values */
@@ -247,18 +248,20 @@ 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 */
 
 #define XPC_RP_HEADER_SIZE      L1_CACHE_ALIGN(sizeof(struct xpc_rsvd_page))
-#define XPC_RP_VARS_SIZE        L1_CACHE_ALIGN(sizeof(struct xpc_vars))
+#define XPC_RP_VARS_SIZE        L1_CACHE_ALIGN(sizeof(struct xpc_vars))
 
-#define XPC_RP_PART_NASIDS(_rp) (u64 *) ((u8 *) _rp + XPC_RP_HEADER_SIZE)
+#define XPC_RP_PART_NASIDS(_rp) ((u64 *)((u8 *)(_rp) + XPC_RP_HEADER_SIZE))
 #define XPC_RP_MACH_NASIDS(_rp) (XPC_RP_PART_NASIDS(_rp) + xp_nasid_mask_words)
-#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)
+#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
@@ -277,8 +280,8 @@ struct xpc_vars_part {
  * Define a Get/Put value pair (pointers) used with a message queue.
  */
 struct xpc_gp {
-        volatile s64 get;       /* Get value */
-        volatile s64 put;       /* Put value */
+        s64 get;                /* Get value */
+        s64 put;                /* Put value */
 };
 
 #define XPC_GP_SIZE \
@@ -315,7 +318,7 @@ struct xpc_openclose_args {
  * and consumed by the intended recipient.
  */
 struct xpc_notify {
-        volatile u8 type;       /* type of notification */
+        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 */
@@ -421,8 +424,8 @@ struct xpc_channel {
         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 */
+        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 */
 
@@ -437,16 +440,16 @@ struct xpc_channel {
         /* 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 */
+        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 */
 
         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 */
 
@@ -458,16 +461,11 @@ struct xpc_channel {
 
         /* kthread management related fields */
 
-// >>> rethink having kthreads_assigned_limit and kthreads_idle_limit; perhaps
-// >>> 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_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 */
 
         wait_queue_head_t idle_wq;      /* idle kthread wait queue */
 
@@ -479,28 +477,28 @@ struct xpc_channel {
 
 #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_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 */
+                                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_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_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
@@ -512,7 +510,7 @@ 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 */
+        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 */
@@ -533,7 +531,7 @@ struct xpc_partition {
 
         /* XPC infrastructure referencing and teardown control */
 
-        volatile u8 setup_state;        /* infrastructure setup state */
+        u8 setup_state;         /* infrastructure setup state */
         wait_queue_head_t teardown_wq;  /* kthread waiting to teardown infra */
         atomic_t references;    /* #of references to infrastructure */
 
@@ -545,32 +543,32 @@ struct xpc_partition {
          */
 
         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 */
+        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 */
+        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 */
+        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 */
+        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 */
@@ -678,9 +676,8 @@ extern void xpc_teardown_infrastructure(struct xpc_partition *);
 static inline void
 xpc_wakeup_channel_mgr(struct xpc_partition *part)
 {
-        if (atomic_inc_return(&part->channel_mgr_requests) == 1) {
+        if (atomic_inc_return(&part->channel_mgr_requests) == 1)
                 wake_up(&part->channel_mgr_wq);
-        }
 }
 
 /*
@@ -699,9 +696,8 @@ xpc_msgqueue_deref(struct xpc_channel *ch)
         s32 refs = atomic_dec_return(&ch->references);
 
         DBUG_ON(refs < 0);
-        if (refs == 0) {
+        if (refs == 0)
                 xpc_wakeup_channel_mgr(&xpc_partitions[ch->partid]);
-        }
 }
 
 #define XPC_DISCONNECT_CHANNEL(_ch, _reason, _irqflgs) \
@@ -717,9 +713,8 @@ 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) {
+        if (refs == 0 && part->setup_state == XPC_P_WTEARDOWN)
                 wake_up(&part->teardown_wq);
-        }
 }
 
 static inline int
@@ -729,9 +724,9 @@ xpc_part_ref(struct xpc_partition *part)
 
         atomic_inc(&part->references);
         setup = (part->setup_state == XPC_P_SETUP);
-        if (!setup) {
+        if (!setup)
                 xpc_part_deref(part);
-        }
+
         return setup;
 }
 
@@ -1007,13 +1002,11 @@ xpc_notify_IRQ_send(struct xpc_channel *ch, u8 ipi_flag, char *ipi_flag_string,
                 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)) {
-                        if (irq_flags != NULL) {
+                        if (irq_flags != NULL)
                                 spin_unlock_irqrestore(&ch->lock, *irq_flags);
-                        }
                         XPC_DEACTIVATE_PARTITION(part, ret);
-                        if (irq_flags != NULL) {
+                        if (irq_flags != NULL)
                                 spin_lock_irqsave(&ch->lock, *irq_flags);
-                        }
                 }
         }
 }
@@ -1056,8 +1049,8 @@ xpc_notify_IRQ_send_local(struct xpc_channel *ch, u8 ipi_flag,
 #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))
 
-#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))
+#define XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(_amo) ((_amo) & 0x0f0f0f0f0f0f0f0fUL)
+#define XPC_ANY_MSG_IPI_FLAGS_SET(_amo)       ((_amo) & 0x1010101010101010UL)
 
 static inline void
 xpc_IPI_send_closerequest(struct xpc_channel *ch, unsigned long *irq_flags)
@@ -1178,9 +1171,8 @@ xpc_check_for_channel_activity(struct xpc_partition *part)
         unsigned long irq_flags;
 
         IPI_amo = xpc_IPI_receive(part->local_IPI_amo_va);
-        if (IPI_amo == 0) {
+        if (IPI_amo == 0)
                 return;
-        }
 
         spin_lock_irqsave(&part->IPI_lock, irq_flags);
         part->local_IPI_amo |= IPI_amo;