[IRDA]: Make the IRDA use the seq_open_private()

Just switch to the consolidated code

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 8 insertions, 60 deletions

diff --git a/net/irda/irlap.c b/net/irda/irlap.c
index 3d76aafdb2e5..f3236acc8d22 100644
--- a/net/irda/irlap.c
+++ b/net/irda/irlap.c
@@ -1219,29 +1219,11 @@ static const struct seq_operations irlap_seq_ops = {
 
 static int irlap_seq_open(struct inode *inode, struct file *file)
 {
-        struct seq_file *seq;
-        int rc = -ENOMEM;
-        struct irlap_iter_state *s = kzalloc(sizeof(*s), GFP_KERNEL);
+        if (irlap == NULL)
+                return -EINVAL;
 
-        if (!s)
-                goto out;
-
-        if (irlap == NULL) {
-                rc = -EINVAL;
-                goto out_kfree;
-        }
-
-        rc = seq_open(file, &irlap_seq_ops);
-        if (rc)
-                goto out_kfree;
-
-        seq          = file->private_data;
-        seq->private = s;
-out:
-        return rc;
-out_kfree:
-        kfree(s);
-        goto out;
+        return seq_open_private(file, &irlap_seq_ops,
+                        sizeof(struct irlap_iter_state));
 }
 
 const struct file_operations irlap_seq_fops = {
diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c
index 7efa930ed684..7db92ced2c02 100644
--- a/net/irda/irlmp.c
+++ b/net/irda/irlmp.c
@@ -2003,27 +2003,10 @@ static const struct seq_operations irlmp_seq_ops = {
 
 static int irlmp_seq_open(struct inode *inode, struct file *file)
 {
-        struct seq_file *seq;
-        int rc = -ENOMEM;
-        struct irlmp_iter_state *s;
-
         IRDA_ASSERT(irlmp != NULL, return -EINVAL;);
 
-        s = kmalloc(sizeof(*s), GFP_KERNEL);
-        if (!s)
-                goto out;
-
-        rc = seq_open(file, &irlmp_seq_ops);
-        if (rc)
-                goto out_kfree;
-
-        seq          = file->private_data;
-        seq->private = s;
-out:
-        return rc;
-out_kfree:
-        kfree(s);
-        goto out;
+        return seq_open_private(file, &irlmp_seq_ops,
+                        sizeof(struct irlmp_iter_state));
 }
 
 const struct file_operations irlmp_seq_fops = {
diff --git a/net/irda/irttp.c b/net/irda/irttp.c
index 3d7ab03fb131..1311976c9dfe 100644
--- a/net/irda/irttp.c
+++ b/net/irda/irttp.c
@@ -1884,25 +1884,8 @@ static const struct seq_operations irttp_seq_ops = {
 
 static int irttp_seq_open(struct inode *inode, struct file *file)
 {
-        struct seq_file *seq;
-        int rc = -ENOMEM;
-        struct irttp_iter_state *s;
-
-        s = kzalloc(sizeof(*s), GFP_KERNEL);
-        if (!s)
-                goto out;
-
-        rc = seq_open(file, &irttp_seq_ops);
-        if (rc)
-                goto out_kfree;
-
-        seq          = file->private_data;
-        seq->private = s;
-out:
-        return rc;
-out_kfree:
-        kfree(s);
-        goto out;
+        return seq_open_private(file, &irttp_seq_ops,
+                        sizeof(struct irttp_iter_state));
 }
 
 const struct file_operations irttp_seq_fops = {