From 597c7e68f165249e686f2546ebf4d6040e3588b4 Mon Sep 17 00:00:00 2001
From: Jon Mason <jdmason@opengridcomputing.com>
Date: Wed, 9 Jan 2008 21:54:11 +0000
Subject: [PATCH] Minor cleanups

This commit was SVN r17100.
---
 ompi/mca/btl/openib/btl_openib.h                      | 4 ++--
 ompi/mca/btl/openib/btl_openib_component.c            | 6 ++----
 ompi/mca/btl/openib/btl_openib_proc.h                 | 2 +-
 ompi/mca/btl/openib/connect/btl_openib_connect_base.c | 1 -
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ompi/mca/btl/openib/btl_openib.h b/ompi/mca/btl/openib/btl_openib.h
index 27de22f996..3ced42d813 100644
--- a/ompi/mca/btl/openib/btl_openib.h
+++ b/ompi/mca/btl/openib/btl_openib.h
@@ -220,7 +220,7 @@ OMPI_MODULE_DECLSPEC extern mca_btl_openib_component_t mca_btl_openib_component;
 
 typedef mca_btl_base_recv_reg_t mca_btl_openib_recv_reg_t; 
     
-struct mca_btl_openib_port_info_t {
+struct mca_btl_openib_port_info {
     uint32_t mtu;
 #if OMPI_ENABLE_HETEROGENEOUS_SUPPORT 
     uint8_t padding[4]; 
@@ -230,7 +230,7 @@ struct mca_btl_openib_port_info_t {
     uint16_t lid; /* used only in xrc */
 #endif
 };
-typedef struct mca_btl_openib_port_info_t mca_btl_openib_port_info_t;
+typedef struct mca_btl_openib_port_info mca_btl_openib_port_info_t;
 
 #if HAVE_XRC
 #define MCA_BTL_OPENIB_LID_NTOH(hdr) (hdr).lid = ntohs((hdr).lid)
diff --git a/ompi/mca/btl/openib/btl_openib_component.c b/ompi/mca/btl/openib/btl_openib_component.c
index 28659e30ea..ae7f0280b3 100644
--- a/ompi/mca/btl/openib/btl_openib_component.c
+++ b/ompi/mca/btl/openib/btl_openib_component.c
@@ -224,8 +224,8 @@ static void btl_openib_control(mca_btl_base_module_t* btl,
                   rdma_hdr->rdma_start.pval, rdma_hdr->rdma_start.ival));
        
        if (ep->eager_rdma_remote.base.pval) {
-	       BTL_ERROR(("Got RDMA connect twice!"));
-	       return;
+           BTL_ERROR(("Got RDMA connect twice!"));
+           return;
        }
        ep->eager_rdma_remote.rkey = rdma_hdr->rkey;
        ep->eager_rdma_remote.base.lval = rdma_hdr->rdma_start.lval;
@@ -1165,7 +1165,6 @@ btl_openib_component_init(int *num_btl_modules,
 #endif
 
     /* Parse the include and exclude lists, checking for errors */
-
     mca_btl_openib_component.if_include_list =
         mca_btl_openib_component.if_exclude_list = 
         mca_btl_openib_component.if_list = NULL;
@@ -1204,7 +1203,6 @@ btl_openib_component_init(int *num_btl_modules,
     dlist_for_each_data(dev_list, ib_dev, struct ibv_device)
         num_devs++; 
 #endif
-
     if(0 == num_devs) { 
         mca_btl_base_error_no_nics("OpenIB", "HCA");
         btl_openib_modex_send();
diff --git a/ompi/mca/btl/openib/btl_openib_proc.h b/ompi/mca/btl/openib/btl_openib_proc.h
index 3fb22de149..59d6bb326d 100644
--- a/ompi/mca/btl/openib/btl_openib_proc.h
+++ b/ompi/mca/btl/openib/btl_openib_proc.h
@@ -46,7 +46,7 @@ struct mca_btl_openib_proc_t {
     orte_process_name_t proc_guid;           
     /**< globally unique identifier for the process */
     
-    struct mca_btl_openib_port_info_t* proc_ports; 
+    mca_btl_openib_port_info_t* proc_ports; 
     size_t proc_port_count;                  
     /**< number of ports published by endpoint */
 
diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_base.c b/ompi/mca/btl/openib/connect/btl_openib_connect_base.c
index 054a904e28..1aee2f1684 100644
--- a/ompi/mca/btl/openib/connect/btl_openib_connect_base.c
+++ b/ompi/mca/btl/openib/connect/btl_openib_connect_base.c
@@ -8,7 +8,6 @@
  * 
  * $HEADER$
  */
-
 #include "ompi_config.h"
 
 #include "btl_openib.h"