diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index ade40d503bf01ae400539fe57d7a396aa2eb3342..a3a152f55dd04401318d67ec876e585c6f8f7805 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3912,18 +3912,13 @@ void nl80211_send_beacon_hint_event(struct wiphy *wiphy,
 
 int nl80211_init(void)
 {
-	int err, i;
+	int err;
 
-	err = genl_register_family(&nl80211_fam);
+	err = genl_register_family_with_ops(&nl80211_fam,
+		nl80211_ops, ARRAY_SIZE(nl80211_ops));
 	if (err)
 		return err;
 
-	for (i = 0; i < ARRAY_SIZE(nl80211_ops); i++) {
-		err = genl_register_ops(&nl80211_fam, &nl80211_ops[i]);
-		if (err)
-			goto err_out;
-	}
-
 	err = genl_register_mc_group(&nl80211_fam, &nl80211_config_mcgrp);
 	if (err)
 		goto err_out;