Skip to content

Commit 13425e7

Browse files
committed
bml r2: very minor cleanups
Delete stale comments, use C99 struct initialization.
1 parent 5aa11a2 commit 13425e7

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

ompi/mca/bml/r2/bml_r2.c

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* All rights reserved.
1313
* Copyright (c) 2007-2014 Los Alamos National Security, LLC. All rights
1414
* reserved.
15-
* Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved.
15+
* Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
1616
* Copyright (c) 2013 Intel, Inc. All rights reserved
1717
* Copyright (c) 2014 NVIDIA Corporation. All rights reserved.
1818
* Copyright (c) 2014 Research Organization for Information Science
@@ -829,22 +829,21 @@ static int mca_bml_r2_register_error( mca_btl_base_module_error_cb_fn_t cbfunc)
829829

830830
int mca_bml_r2_component_fini(void)
831831
{
832-
/* FIX */
833832
return OMPI_SUCCESS;
834833
}
835834

836835
mca_bml_r2_module_t mca_bml_r2 = {
837-
{
838-
&mca_bml_r2_component,
839-
mca_bml_r2_add_procs,
840-
mca_bml_r2_del_procs,
841-
mca_bml_r2_add_btl,
842-
mca_bml_r2_del_btl,
843-
mca_bml_r2_del_proc_btl,
844-
mca_bml_r2_register,
845-
mca_bml_r2_register_error,
846-
mca_bml_r2_finalize,
847-
mca_bml_r2_ft_event
836+
.super = {
837+
.bml_component = &mca_bml_r2_component,
838+
.bml_add_procs = mca_bml_r2_add_procs,
839+
.bml_del_procs = mca_bml_r2_del_procs,
840+
.bml_add_btl = mca_bml_r2_add_btl,
841+
.bml_del_btl = mca_bml_r2_del_btl,
842+
.bml_del_proc_btl = mca_bml_r2_del_proc_btl,
843+
.bml_register = mca_bml_r2_register,
844+
.bml_register_error = mca_bml_r2_register_error,
845+
.bml_finalize = mca_bml_r2_finalize,
846+
.bml_ft_event = mca_bml_r2_ft_event
848847
}
849848

850849
};

ompi/mca/bml/r2/bml_r2_component.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* University of Stuttgart. All rights reserved.
1111
* Copyright (c) 2004-2006 The Regents of the University of California.
1212
* All rights reserved.
13-
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
13+
* Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
1515
* reserved.
1616
* $COPYRIGHT$
@@ -73,9 +73,6 @@ int mca_bml_r2_component_open(void)
7373

7474
int mca_bml_r2_component_close(void)
7575
{
76-
77-
/* OBJ_DESTRUCT(&mca_bml_r2.lock); */
78-
7976
return OMPI_SUCCESS;
8077
}
8178

0 commit comments

Comments
 (0)