Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a662d4cb authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

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



Just switch to the consolidated code

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 31164088

net/irda/irlap.c

+4 −22
Original line number Diff line number Diff line
@@ -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 = {

net/irda/irlmp.c

+2 −19
Original line number Diff line number Diff line
@@ -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 = {

net/irda/irttp.c

+2 −19
Original line number Diff line number Diff line
@@ -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 = {