From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Thu, 21 May 2009 10:34:04 +0000 (+0000)
Subject: irda: Use genl_register_family_with_ops()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=502664eeaf880d364821521bbced7ae342f77f64;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

irda: Use genl_register_family_with_ops()

Use genl_register_family_with_ops() instead of a copy.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Cc: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/irda/irnetlink.c b/net/irda/irnetlink.c
index 82c6118d82c6..8dd7ed7e7c1f 100644
--- a/net/irda/irnetlink.c
+++ b/net/irda/irnetlink.c
@@ -148,21 +148,8 @@ static struct genl_ops irda_nl_ops[] = {
 
 int irda_nl_register(void)
 {
-	int err, i;
-
-	err = genl_register_family(&irda_nl_family);
-	if (err)
-		return err;
-
-	for (i = 0; i < ARRAY_SIZE(irda_nl_ops); i++) {
-		err = genl_register_ops(&irda_nl_family, &irda_nl_ops[i]);
-		if (err)
-			goto err_out;
-	}
-	return 0;
- err_out:
-	genl_unregister_family(&irda_nl_family);
-	return err;
+	return genl_register_family_with_ops(&irda_nl_family,
+		irda_nl_ops, ARRAY_SIZE(irda_nl_ops));
 }
 
 void irda_nl_unregister(void)