From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-rdma@vger.kernel.org, Doug Ledford <dledford@redhat.com>,
Hal Rosenstock <hal.rosenstock@gmail.com>,
Sean Hefty <sean.hefty@intel.com>, Steve Wise <swise@chelsio.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 06/14] RDMA/cxgb4: Return an error code only as a constant in stag_open()
Date: Wed, 8 Feb 2017 22:16:46 +0100 [thread overview]
Message-ID: <b636e00c-5a42-cdaa-9286-c4b7e48b497b@users.sourceforge.net> (raw)
In-Reply-To: <0aff92fa-2891-333a-2e1e-ca309db2ec72@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 8 Feb 2017 16:50:52 +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 51801a7d4fb3..90fa96abb5bc 100644
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -433,14 +433,12 @@ static int stag_release(struct inode *inode, struct file *file)
static int stag_open(struct inode *inode, struct file *file)
{
struct c4iw_debugfs_data *stagd;
- int ret = 0;
int count = 1;
stagd = kmalloc(sizeof *stagd, GFP_KERNEL);
- if (!stagd) {
- ret = -ENOMEM;
- goto out;
- }
+ if (!stagd)
+ goto failure_indication;
+
stagd->devp = inode->i_private;
stagd->pos = 0;
@@ -450,10 +448,8 @@ static int stag_open(struct inode *inode, struct file *file)
stagd->bufsize = count * 256;
stagd->buf = vmalloc(stagd->bufsize);
- if (!stagd->buf) {
- ret = -ENOMEM;
- goto err1;
- }
+ if (!stagd->buf)
+ goto free_stagd;
spin_lock_irq(&stagd->devp->lock);
idr_for_each(&stagd->devp->mmidr, dump_stag, stagd);
@@ -461,11 +457,11 @@ static int stag_open(struct inode *inode, struct file *file)
stagd->buf[stagd->pos++] = 0;
file->private_data = stagd;
- goto out;
-err1:
+ return 0;
+free_stagd:
kfree(stagd);
-out:
- return ret;
+failure_indication:
+ return -ENOMEM;
}
static const struct file_operations stag_debugfs_fops = {
--
2.11.1
next prev parent reply other threads:[~2017-02-08 21:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-08 21:10 [PATCH 00/14] RDMA/cxgb: Fine-tuning for several function implementations SF Markus Elfring
2017-02-08 21:11 ` [PATCH 01/14] RDMA/cxgb3: Use kcalloc() in cxio_create_qp() SF Markus Elfring
2017-02-08 21:12 ` [PATCH 02/14] RDMA/cxgb3: Rename jump labels " SF Markus Elfring
2017-02-08 21:35 ` Andy Shevchenko
2017-02-08 21:14 ` [PATCH 04/14] RDMA/cxgb4: Use common error handling code in recover_queues() SF Markus Elfring
2017-02-09 9:30 ` Johannes Thumshirn
2017-02-08 21:16 ` SF Markus Elfring [this message]
2017-02-08 21:17 ` [PATCH 07/14] RDMA/cxgb4: Adjust three checks for null pointers SF Markus Elfring
[not found] ` <0aff92fa-2891-333a-2e1e-ca309db2ec72-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-02-08 21:13 ` [PATCH 03/14] RDMA/cxgb4: Use kcalloc() in two functions SF Markus Elfring
2017-02-08 21:15 ` [PATCH 05/14] RDMA/cxgb4: Return an error code only as a constant in ep_open() SF Markus Elfring
2017-02-08 21:18 ` [PATCH 08/14] RDMA/cxgb4: Adjust construction of two error messages in recover_lost_dbs() SF Markus Elfring
2017-02-08 21:22 ` [PATCH 12/14] RDMA/cxgb4: Delete an unnecessary variable initialisation in create_qp() SF Markus Elfring
[not found] ` <b319a50e-9e2a-61c0-5707-b4549b077d6a-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
2017-02-09 9:02 ` Leon Romanovsky
2017-02-08 21:23 ` [PATCH 13/14] RDMA/cxgb4: Rename jump labels in c4iw_create_qp() SF Markus Elfring
2017-02-08 21:24 ` [PATCH 14/14] RDMA/cxgb4: Rename jump labels in rdma_init() SF Markus Elfring
2017-02-08 21:19 ` [PATCH 09/14] RDMA/cxgb4: Use common error handling code in recover_lost_dbs() SF Markus Elfring
2017-02-09 18:57 ` Leon Romanovsky
2017-02-08 21:20 ` [PATCH 10/14] RDMA/cxgb4: Use kmalloc_array() in c4iw_id_table_alloc() SF Markus Elfring
2017-02-08 21:21 ` [PATCH 11/14] RDMA/cxgb4: Use kcalloc() in create_qp() SF Markus Elfring
2017-04-05 18:16 ` [PATCH 00/14] RDMA/cxgb: Fine-tuning for several function implementations Doug Ledford
[not found] ` <1491416174.2923.3.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-04-09 6:30 ` Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b636e00c-5a42-cdaa-9286-c4b7e48b497b@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=dledford@redhat.com \
--cc=hal.rosenstock@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=sean.hefty@intel.com \
--cc=swise@chelsio.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).