3 files changed, 6 insertions, 42 deletions

diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c
index bf1ab1a6790d..e639298bc9c8 100644
--- a/net/netlabel/netlabel_cipso_v4.c
+++ b/net/netlabel/netlabel_cipso_v4.c
@@ -785,18 +785,6 @@ static struct genl_ops netlbl_cipsov4_ops[] = {
  */
 int __init netlbl_cipsov4_genl_init(void)
 {
-        int ret_val, i;
-
-        ret_val = genl_register_family(&netlbl_cipsov4_gnl_family);
-        if (ret_val != 0)
-                return ret_val;
-
-        for (i = 0; i < ARRAY_SIZE(netlbl_cipsov4_ops); i++) {
-                ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
-                                &netlbl_cipsov4_ops[i]);
-                if (ret_val != 0)
-                        return ret_val;
-        }
-
-        return 0;
+        return genl_register_family_with_ops(&netlbl_cipsov4_gnl_family,
+                netlbl_cipsov4_ops, ARRAY_SIZE(netlbl_cipsov4_ops));
 }
diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c
index 1821c5d50fb8..8203623e65ad 100644
--- a/net/netlabel/netlabel_mgmt.c
+++ b/net/netlabel/netlabel_mgmt.c
@@ -779,18 +779,6 @@ static struct genl_ops netlbl_mgmt_genl_ops[] = {
  */
 int __init netlbl_mgmt_genl_init(void)
 {
-        int ret_val, i;
-
-        ret_val = genl_register_family(&netlbl_mgmt_gnl_family);
-        if (ret_val != 0)
-                return ret_val;
-
-        for (i = 0; i < ARRAY_SIZE(netlbl_mgmt_genl_ops); i++) {
-                ret_val = genl_register_ops(&netlbl_mgmt_gnl_family,
-                                &netlbl_mgmt_genl_ops[i]);
-                if (ret_val != 0)
-                        return ret_val;
-        }
-
-        return 0;
+        return genl_register_family_with_ops(&netlbl_mgmt_gnl_family,
+                netlbl_mgmt_genl_ops, ARRAY_SIZE(netlbl_mgmt_genl_ops));
 }
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index f3c5c68c6848..fb357f010189 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -1478,20 +1478,8 @@ static struct genl_ops netlbl_unlabel_genl_ops[] = {
  */
 int __init netlbl_unlabel_genl_init(void)
 {
-        int ret_val, i;
-
-        ret_val = genl_register_family(&netlbl_unlabel_gnl_family);
-        if (ret_val != 0)
-                return ret_val;
-
-        for (i = 0; i < ARRAY_SIZE(netlbl_unlabel_genl_ops); i++) {
-                ret_val = genl_register_ops(&netlbl_unlabel_gnl_family,
-                                &netlbl_unlabel_genl_ops[i]);
-                if (ret_val != 0)
-                        return ret_val;
-        }
-
-        return 0;
+        return genl_register_family_with_ops(&netlbl_unlabel_gnl_family,
+                netlbl_unlabel_genl_ops, ARRAY_SIZE(netlbl_unlabel_genl_ops));
 }
 
 /*