Skip to content

Commit

Permalink
[IRDA]: Make the IRDA use the seq_open_private()
Browse files Browse the repository at this point in the history
Just switch to the consolidated code

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Oct 10, 2007
1 parent 3116408 commit a662d4c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 60 deletions.
26 changes: 4 additions & 22 deletions net/irda/irlap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
21 changes: 2 additions & 19 deletions net/irda/irlmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
21 changes: 2 additions & 19 deletions net/irda/irttp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit a662d4c

Please sign in to comment.