Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1577070

[PATCH 05/14] RDMA/cxgb4: Return an error code only as a constant in ep_open()

Show all headers | View raw

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 8 Feb 2017 16:36:31 +0100

* Return an error code without storing it in an intermediate variable.

* Adjust jump targets according to the Linux coding style convention.

* Delete the local variable "ret" which became unnecessary with
  this refactoring.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/infiniband/hw/cxgb4/device.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c
index 46410c4a9afb..51801a7d4fb3 100644
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -679,14 +679,12 @@ static int ep_release(struct inode *inode, struct file *file)
 static int ep_open(struct inode *inode, struct file *file)
 {
 	struct c4iw_debugfs_data *epd;
-	int ret = 0;
 	int count = 1;
 
 	epd = kmalloc(sizeof(*epd), GFP_KERNEL);
-	if (!epd) {
-		ret = -ENOMEM;
-		goto out;
-	}
+	if (!epd)
+		goto failure_indication;
+
 	epd->devp = inode->i_private;
 	epd->pos = 0;
 
@@ -698,10 +696,8 @@ static int ep_open(struct inode *inode, struct file *file)
 
 	epd->bufsize = count * 240;
 	epd->buf = vmalloc(epd->bufsize);
-	if (!epd->buf) {
-		ret = -ENOMEM;
-		goto err1;
-	}
+	if (!epd->buf)
+		goto free_epd;
 
 	spin_lock_irq(&epd->devp->lock);
 	idr_for_each(&epd->devp->hwtid_idr, dump_ep, epd);
@@ -710,11 +706,11 @@ static int ep_open(struct inode *inode, struct file *file)
 	spin_unlock_irq(&epd->devp->lock);
 
 	file->private_data = epd;
-	goto out;
-err1:
+	return 0;
+free_epd:
 	kfree(epd);
-out:
-	return ret;
+failure_indication:
+	return -ENOMEM;
 }
 
 static const struct file_operations ep_debugfs_fops = {
-- 
2.11.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 05/14] RDMA/cxgb4: Return an error code only as a constant in  ep_open() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-02-08 22:20 +0100

csiph-web