From: Peng Li <lipeng321@huawei.com>
To: <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linuxarm@huawei.com>, <yisen.zhuang@huawei.com>,
<salil.mehta@huawei.com>, <lipeng321@huawei.com>
Subject: [PATCH net-next 06/10] net: hns3: remove a redundant hclge_cmd_csq_done
Date: Fri, 29 Jun 2018 19:23:01 +0800 [thread overview]
Message-ID: <1530271385-49668-7-git-send-email-lipeng321@huawei.com> (raw)
In-Reply-To: <1530271385-49668-1-git-send-email-lipeng321@huawei.com>
From: Huazhong Tan <tanhuazhong@huawei.com>
Set complete in the first hclge_cmd_csq_done of hclge_cmd_send,
and check if complete later, unnecessary to do hclge_cmd_csq_done
again.
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
index 28556a9..facfff6 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
@@ -241,15 +241,18 @@ int hclge_cmd_send(struct hclge_hw *hw, struct hclge_desc *desc, int num)
*/
if (HCLGE_SEND_SYNC(le16_to_cpu(desc->flag))) {
do {
- if (hclge_cmd_csq_done(hw))
+ if (hclge_cmd_csq_done(hw)) {
+ complete = true;
break;
+ }
udelay(1);
timeout++;
} while (timeout < hw->cmq.tx_timeout);
}
- if (hclge_cmd_csq_done(hw)) {
- complete = true;
+ if (!complete) {
+ retval = -EAGAIN;
+ } else {
handle = 0;
while (handle < num) {
/* Get the result of hardware write back */
@@ -272,9 +275,6 @@ int hclge_cmd_send(struct hclge_hw *hw, struct hclge_desc *desc, int num)
}
}
- if (!complete)
- retval = -EAGAIN;
-
/* Clean the command send queue */
handle = hclge_cmd_csq_clean(hw);
if (handle != num) {
--
1.9.1
next prev parent reply other threads:[~2018-06-29 10:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-29 11:22 [PATCH net-next 00/10] net: hns3: a few code improvements Peng Li
2018-06-29 11:22 ` [PATCH net-next 01/10] net: hns3: remove unused hclge_ring_to_dma_dir Peng Li
2018-06-29 11:22 ` [PATCH net-next 02/10] net: hns3: remove useless code in hclge_cmd_send Peng Li
2018-06-29 11:22 ` [PATCH net-next 03/10] net: hns3: remove some redundant assignments Peng Li
2018-06-29 11:22 ` [PATCH net-next 04/10] net: hns3: simplify hclge_cmd_csq_clean Peng Li
2018-06-29 11:23 ` [PATCH net-next 05/10] net: hns3: using modulo for cyclic counters in hclge_cmd_send Peng Li
2018-06-30 12:03 ` David Miller
2018-07-02 7:06 ` lipeng (Y)
2018-06-29 11:23 ` Peng Li [this message]
2018-06-29 11:23 ` [PATCH net-next 07/10] net: hns3: remove some unused members of some structures Peng Li
2018-06-29 11:23 ` [PATCH net-next 08/10] net: hns3: give default option while dependency HNS3 set Peng Li
2018-06-29 11:23 ` [PATCH net-next 09/10] net: hns3: use dma_zalloc_coherent instead of kzalloc/dma_map_single Peng Li
2018-06-29 11:23 ` [PATCH net-next 10/10] net: hns3: modify hnae_ to hnae3_ Peng Li
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=1530271385-49668-7-git-send-email-lipeng321@huawei.com \
--to=lipeng321@huawei.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=salil.mehta@huawei.com \
--cc=yisen.zhuang@huawei.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).