sgi-xpc: clean up numerous globals

Introduce xpc_arch_ops and eliminate numerous individual global definitions.

Signed-off-by: Robin Holt <holt@sgi.com>
Cc: Dean Nelson <dcn@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 63 insertions, 59 deletions

diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c
index 1e475b4c088..9172fcdee4e 100644
--- a/drivers/misc/sgi-xp/xpc_uv.c
+++ b/drivers/misc/sgi-xp/xpc_uv.c
@@ -62,7 +62,7 @@ static struct xpc_gru_mq_uv *xpc_activate_mq_uv;
 static struct xpc_gru_mq_uv *xpc_notify_mq_uv;
 
 static int
-xpc_setup_partitions_sn_uv(void)
+xpc_setup_partitions_uv(void)
 {
         short partid;
         struct xpc_partition_uv *part_uv;
@@ -78,7 +78,7 @@ xpc_setup_partitions_sn_uv(void)
 }
 
 static void
-xpc_teardown_partitions_sn_uv(void)
+xpc_teardown_partitions_uv(void)
 {
         short partid;
         struct xpc_partition_uv *part_uv;
@@ -782,7 +782,7 @@ xpc_get_partition_rsvd_page_pa_uv(void *buf, u64 *cookie, unsigned long *rp_pa,
 }
 
 static int
-xpc_setup_rsvd_page_sn_uv(struct xpc_rsvd_page *rp)
+xpc_setup_rsvd_page_uv(struct xpc_rsvd_page *rp)
 {
         xpc_heartbeat_uv =
             &xpc_partitions[sn_partition_id].sn.uv.cached_heartbeat;
@@ -980,7 +980,7 @@ xpc_n_of_fifo_entries_uv(struct xpc_fifo_head_uv *head)
  * Setup the channel structures that are uv specific.
  */
 static enum xp_retval
-xpc_setup_ch_structures_sn_uv(struct xpc_partition *part)
+xpc_setup_ch_structures_uv(struct xpc_partition *part)
 {
         struct xpc_channel_uv *ch_uv;
         int ch_number;
@@ -999,7 +999,7 @@ xpc_setup_ch_structures_sn_uv(struct xpc_partition *part)
  * Teardown the channel structures that are uv specific.
  */
 static void
-xpc_teardown_ch_structures_sn_uv(struct xpc_partition *part)
+xpc_teardown_ch_structures_uv(struct xpc_partition *part)
 {
         /* nothing needs to be done */
         return;
@@ -1649,63 +1649,67 @@ xpc_received_payload_uv(struct xpc_channel *ch, void *payload)
         msg->hdr.msg_slot_number += ch->remote_nentries;
 }
 
+static struct xpc_arch_operations xpc_arch_ops_uv = {
+        .setup_partitions = xpc_setup_partitions_uv,
+        .teardown_partitions = xpc_teardown_partitions_uv,
+        .process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_uv,
+        .get_partition_rsvd_page_pa = xpc_get_partition_rsvd_page_pa_uv,
+        .setup_rsvd_page = xpc_setup_rsvd_page_uv,
+
+        .allow_hb = xpc_allow_hb_uv,
+        .disallow_hb = xpc_disallow_hb_uv,
+        .disallow_all_hbs = xpc_disallow_all_hbs_uv,
+        .increment_heartbeat = xpc_increment_heartbeat_uv,
+        .offline_heartbeat = xpc_offline_heartbeat_uv,
+        .online_heartbeat = xpc_online_heartbeat_uv,
+        .heartbeat_init = xpc_heartbeat_init_uv,
+        .heartbeat_exit = xpc_heartbeat_exit_uv,
+        .get_remote_heartbeat = xpc_get_remote_heartbeat_uv,
+
+        .request_partition_activation =
+                xpc_request_partition_activation_uv,
+        .request_partition_reactivation =
+                xpc_request_partition_reactivation_uv,
+        .request_partition_deactivation =
+                xpc_request_partition_deactivation_uv,
+        .cancel_partition_deactivation_request =
+                xpc_cancel_partition_deactivation_request_uv,
+
+        .setup_ch_structures = xpc_setup_ch_structures_uv,
+        .teardown_ch_structures = xpc_teardown_ch_structures_uv,
+
+        .make_first_contact = xpc_make_first_contact_uv,
+
+        .get_chctl_all_flags = xpc_get_chctl_all_flags_uv,
+        .send_chctl_closerequest = xpc_send_chctl_closerequest_uv,
+        .send_chctl_closereply = xpc_send_chctl_closereply_uv,
+        .send_chctl_openrequest = xpc_send_chctl_openrequest_uv,
+        .send_chctl_openreply = xpc_send_chctl_openreply_uv,
+        .send_chctl_opencomplete = xpc_send_chctl_opencomplete_uv,
+        .process_msg_chctl_flags = xpc_process_msg_chctl_flags_uv,
+
+        .save_remote_msgqueue_pa = xpc_save_remote_msgqueue_pa_uv,
+
+        .setup_msg_structures = xpc_setup_msg_structures_uv,
+        .teardown_msg_structures = xpc_teardown_msg_structures_uv,
+
+        .indicate_partition_engaged = xpc_indicate_partition_engaged_uv,
+        .indicate_partition_disengaged = xpc_indicate_partition_disengaged_uv,
+        .assume_partition_disengaged = xpc_assume_partition_disengaged_uv,
+        .partition_engaged = xpc_partition_engaged_uv,
+        .any_partition_engaged = xpc_any_partition_engaged_uv,
+
+        .n_of_deliverable_payloads = xpc_n_of_deliverable_payloads_uv,
+        .send_payload = xpc_send_payload_uv,
+        .get_deliverable_payload = xpc_get_deliverable_payload_uv,
+        .received_payload = xpc_received_payload_uv,
+        .notify_senders_of_disconnect = xpc_notify_senders_of_disconnect_uv,
+};
+
 int
 xpc_init_uv(void)
 {
-        xpc_setup_partitions_sn = xpc_setup_partitions_sn_uv;
-        xpc_teardown_partitions_sn = xpc_teardown_partitions_sn_uv;
-        xpc_process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_uv;
-        xpc_get_partition_rsvd_page_pa = xpc_get_partition_rsvd_page_pa_uv;
-        xpc_setup_rsvd_page_sn = xpc_setup_rsvd_page_sn_uv;
-
-        xpc_allow_hb = xpc_allow_hb_uv;
-        xpc_disallow_hb = xpc_disallow_hb_uv;
-        xpc_disallow_all_hbs = xpc_disallow_all_hbs_uv;
-        xpc_increment_heartbeat = xpc_increment_heartbeat_uv;
-        xpc_offline_heartbeat = xpc_offline_heartbeat_uv;
-        xpc_online_heartbeat = xpc_online_heartbeat_uv;
-        xpc_heartbeat_init = xpc_heartbeat_init_uv;
-        xpc_heartbeat_exit = xpc_heartbeat_exit_uv;
-        xpc_get_remote_heartbeat = xpc_get_remote_heartbeat_uv;
-
-        xpc_request_partition_activation = xpc_request_partition_activation_uv;
-        xpc_request_partition_reactivation =
-            xpc_request_partition_reactivation_uv;
-        xpc_request_partition_deactivation =
-            xpc_request_partition_deactivation_uv;
-        xpc_cancel_partition_deactivation_request =
-            xpc_cancel_partition_deactivation_request_uv;
-
-        xpc_setup_ch_structures_sn = xpc_setup_ch_structures_sn_uv;
-        xpc_teardown_ch_structures_sn = xpc_teardown_ch_structures_sn_uv;
-
-        xpc_make_first_contact = xpc_make_first_contact_uv;
-
-        xpc_get_chctl_all_flags = xpc_get_chctl_all_flags_uv;
-        xpc_send_chctl_closerequest = xpc_send_chctl_closerequest_uv;
-        xpc_send_chctl_closereply = xpc_send_chctl_closereply_uv;
-        xpc_send_chctl_openrequest = xpc_send_chctl_openrequest_uv;
-        xpc_send_chctl_openreply = xpc_send_chctl_openreply_uv;
-        xpc_send_chctl_opencomplete = xpc_send_chctl_opencomplete_uv;
-
-        xpc_save_remote_msgqueue_pa = xpc_save_remote_msgqueue_pa_uv;
-
-        xpc_setup_msg_structures = xpc_setup_msg_structures_uv;
-        xpc_teardown_msg_structures = xpc_teardown_msg_structures_uv;
-
-        xpc_indicate_partition_engaged = xpc_indicate_partition_engaged_uv;
-        xpc_indicate_partition_disengaged =
-            xpc_indicate_partition_disengaged_uv;
-        xpc_assume_partition_disengaged = xpc_assume_partition_disengaged_uv;
-        xpc_partition_engaged = xpc_partition_engaged_uv;
-        xpc_any_partition_engaged = xpc_any_partition_engaged_uv;
-
-        xpc_n_of_deliverable_payloads = xpc_n_of_deliverable_payloads_uv;
-        xpc_process_msg_chctl_flags = xpc_process_msg_chctl_flags_uv;
-        xpc_send_payload = xpc_send_payload_uv;
-        xpc_notify_senders_of_disconnect = xpc_notify_senders_of_disconnect_uv;
-        xpc_get_deliverable_payload = xpc_get_deliverable_payload_uv;
-        xpc_received_payload = xpc_received_payload_uv;
+        xpc_arch_ops = xpc_arch_ops_uv;
 
         if (sizeof(struct xpc_notify_mq_msghdr_uv) > XPC_MSG_HDR_MAX_SIZE) {
                 dev_err(xpc_part, "xpc_notify_mq_msghdr_uv is larger than %d\n",