From: Alex Dewar <alex.dewar90@gmail.com>
To: alex.dewar90@gmail.com
Cc: dennis.dalessandro@intel.com, dledford@redhat.com,
gustavo@embeddedor.com, jgg@ziepe.ca, joe@perches.com,
linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org,
mike.marciniszyn@intel.com, roland@purestorage.com
Subject: [PATCH v2 2/2] IB/qib: tidy up process_cc()
Date: Tue, 25 Aug 2020 18:12:44 +0100 [thread overview]
Message-ID: <20200825171242.448447-2-alex.dewar90@gmail.com> (raw)
In-Reply-To: <64d7e1c9-9c6a-93f3-ce0a-c24b1c236071@gmail.com>
This function has a lot of gotos which could be replaced by simple
returns, making the function tidier and less bug prone.
Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
---
drivers/infiniband/hw/qib/qib_mad.c | 50 ++++++++---------------------
1 file changed, 13 insertions(+), 37 deletions(-)
diff --git a/drivers/infiniband/hw/qib/qib_mad.c b/drivers/infiniband/hw/qib/qib_mad.c
index f972e559a8a7..f83e331977f8 100644
--- a/drivers/infiniband/hw/qib/qib_mad.c
+++ b/drivers/infiniband/hw/qib/qib_mad.c
@@ -2293,74 +2293,50 @@ static int process_cc(struct ib_device *ibdev, int mad_flags,
struct ib_mad *out_mad)
{
struct ib_cc_mad *ccp = (struct ib_cc_mad *)out_mad;
- int ret;
-
*out_mad = *in_mad;
if (ccp->class_version != 2) {
ccp->status |= IB_SMP_UNSUP_VERSION;
- ret = reply((struct ib_smp *)ccp);
- goto bail;
+ return reply((struct ib_smp *)ccp);
}
switch (ccp->method) {
case IB_MGMT_METHOD_GET:
switch (ccp->attr_id) {
case IB_CC_ATTR_CLASSPORTINFO:
- ret = cc_get_classportinfo(ccp, ibdev);
- goto bail;
-
+ return cc_get_classportinfo(ccp, ibdev);
case IB_CC_ATTR_CONGESTION_INFO:
- ret = cc_get_congestion_info(ccp, ibdev, port);
- goto bail;
-
+ return cc_get_congestion_info(ccp, ibdev, port);
case IB_CC_ATTR_CA_CONGESTION_SETTING:
- ret = cc_get_congestion_setting(ccp, ibdev, port);
- goto bail;
-
+ return cc_get_congestion_setting(ccp, ibdev, port);
case IB_CC_ATTR_CONGESTION_CONTROL_TABLE:
- ret = cc_get_congestion_control_table(ccp, ibdev, port);
- goto bail;
-
+ return cc_get_congestion_control_table(ccp, ibdev, port);
default:
ccp->status |= IB_SMP_UNSUP_METH_ATTR;
- ret = reply((struct ib_smp *) ccp);
- goto bail;
+ return reply((struct ib_smp *) ccp);
}
-
case IB_MGMT_METHOD_SET:
switch (ccp->attr_id) {
case IB_CC_ATTR_CA_CONGESTION_SETTING:
- ret = cc_set_congestion_setting(ccp, ibdev, port);
- goto bail;
-
+ return cc_set_congestion_setting(ccp, ibdev, port);
case IB_CC_ATTR_CONGESTION_CONTROL_TABLE:
- ret = cc_set_congestion_control_table(ccp, ibdev, port);
- goto bail;
-
+ return cc_set_congestion_control_table(ccp, ibdev, port);
default:
ccp->status |= IB_SMP_UNSUP_METH_ATTR;
- ret = reply((struct ib_smp *) ccp);
- goto bail;
+ return reply((struct ib_smp *) ccp);
}
-
case IB_MGMT_METHOD_GET_RESP:
/*
* The ib_mad module will call us to process responses
* before checking for other consumers.
* Just tell the caller to process it normally.
*/
- ret = IB_MAD_RESULT_SUCCESS;
- goto bail;
-
- case IB_MGMT_METHOD_TRAP:
- default:
- ccp->status |= IB_SMP_UNSUP_METHOD;
- ret = reply((struct ib_smp *) ccp);
+ return IB_MAD_RESULT_SUCCESS;
}
-bail:
- return ret;
+ /* method is unsupported */
+ ccp->status |= IB_SMP_UNSUP_METHOD;
+ return reply((struct ib_smp *) ccp);
}
/**
--
2.28.0
prev parent reply other threads:[~2020-08-25 17:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 15:51 [PATCH] IB/qib: remove superfluous fallthrough statements Alex Dewar
2020-08-25 16:19 ` Gustavo A. R. Silva
2020-08-25 16:26 ` Joe Perches
2020-08-25 16:49 ` Gustavo A. R. Silva
2020-08-25 16:47 ` Joe Perches
2020-08-25 17:01 ` Gustavo A. R. Silva
2020-08-25 20:55 ` Joe Perches
2020-08-25 16:58 ` Alex Dewar
2020-08-25 17:12 ` [PATCH v2 1/2] " Alex Dewar
2020-08-25 19:33 ` Gustavo A. R. Silva
2020-08-26 19:18 ` Gustavo A. R. Silva
2020-08-27 0:11 ` Jason Gunthorpe
2020-08-27 1:41 ` Gustavo A. R. Silva
2020-08-27 10:40 ` Alex Dewar
2020-08-31 16:25 ` Jason Gunthorpe
2020-08-25 17:12 ` Alex Dewar [this message]
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=20200825171242.448447-2-alex.dewar90@gmail.com \
--to=alex.dewar90@gmail.com \
--cc=dennis.dalessandro@intel.com \
--cc=dledford@redhat.com \
--cc=gustavo@embeddedor.com \
--cc=jgg@ziepe.ca \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=mike.marciniszyn@intel.com \
--cc=roland@purestorage.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).