From: Salil Mehta <salil.mehta@huawei.com>
To: <davem@davemloft.net>
Cc: <salil.mehta@huawei.com>, <yisen.zhuang@huawei.com>,
<mehta.salil.lnk@gmail.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linuxarm@huawei.com>
Subject: [PATCH net 19/19] net: hns: Some checkpatch.pl script & warning fixes
Date: Thu, 30 Mar 2017 16:31:06 +0100 [thread overview]
Message-ID: <20170330153106.14344-20-salil.mehta@huawei.com> (raw)
In-Reply-To: <20170330153106.14344-1-salil.mehta@huawei.com>
This patch fixes some checkpatch.pl script caught errors and
warnings during the compilation time.
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
---
drivers/net/ethernet/hisilicon/hns/hnae.h | 1 -
drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 11 +++++------
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 2 +-
drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 1 -
drivers/net/ethernet/hisilicon/hns/hns_enet.c | 9 +++++----
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 1 -
6 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.h b/drivers/net/ethernet/hisilicon/hns/hnae.h
index a2c49ea..c8c41d2 100644
--- a/drivers/net/ethernet/hisilicon/hns/hnae.h
+++ b/drivers/net/ethernet/hisilicon/hns/hnae.h
@@ -103,7 +103,6 @@ enum hnae_led_state {
#define HNS_RX_FLAG_L4ID_TCP 0x1
#define HNS_RX_FLAG_L4ID_SCTP 0x3
-
#define HNS_TXD_ASID_S 0
#define HNS_TXD_ASID_M (0xff << HNS_TXD_ASID_S)
#define HNS_TXD_BUFNUM_S 8
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
index 035db86..74bd260 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
@@ -86,12 +86,11 @@ static void hns_gmac_disable(void *mac_drv, enum mac_commom_mode mode)
dsaf_set_dev_bit(drv, GMAC_PORT_EN_REG, GMAC_PORT_RX_EN_B, 0);
}
-/**
-*hns_gmac_get_en - get port enable
-*@mac_drv:mac device
-*@rx:rx enable
-*@tx:tx enable
-*/
+/* hns_gmac_get_en - get port enable
+ * @mac_drv:mac device
+ * @rx:rx enable
+ * @tx:tx enable
+ */
static void hns_gmac_get_en(void *mac_drv, u32 *rx, u32 *tx)
{
struct mac_driver *drv = (struct mac_driver *)mac_drv;
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
index 4db02e2..4507e82 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
@@ -68,7 +68,7 @@ enum dsaf_roce_qos_sl {
};
#define DSAF_STATS_READ(p, offset) (*((u64 *)((u8 *)(p) + (offset))))
-#define HNS_DSAF_IS_DEBUG(dev) (dev->dsaf_mode == DSAF_MODE_DISABLE_SP)
+#define HNS_DSAF_IS_DEBUG(dev) ((dev)->dsaf_mode == DSAF_MODE_DISABLE_SP)
enum hal_dsaf_mode {
HRD_DSAF_NO_DSAF_MODE = 0x0,
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
index 9b66057..c20a0f4 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
@@ -471,7 +471,6 @@ static void hns_rcb_ring_pair_get_cfg(struct ring_pair_cb *ring_pair_cb)
static int hns_rcb_get_port_in_comm(
struct rcb_common_cb *rcb_common, int ring_idx)
{
-
return ring_idx / (rcb_common->max_q_per_vf * rcb_common->max_vfn);
}
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index c4aa095..e307568 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -514,7 +514,8 @@ static void hns_nic_reuse_page(struct sk_buff *skb, int i,
int last_offset;
bool twobufs;
- twobufs = ((PAGE_SIZE < 8192) && hnae_buf_size(ring) == HNS_BUFFER_SIZE_2048);
+ twobufs = ((PAGE_SIZE < 8192) && hnae_buf_size(ring)
+ == HNS_BUFFER_SIZE_2048);
desc = &ring->desc[ring->next_to_clean];
size = le16_to_cpu(desc->rx.size);
@@ -924,8 +925,8 @@ static int is_valid_clean_head(struct hnae_ring *ring, int h)
/* netif_tx_lock will turn down the performance, set only when necessary */
#ifdef CONFIG_NET_POLL_CONTROLLER
-#define NETIF_TX_LOCK(ring) spin_lock(&ring->lock)
-#define NETIF_TX_UNLOCK(ring) spin_unlock(&ring->lock)
+#define NETIF_TX_LOCK(ring) spin_lock(&(ring)->lock)
+#define NETIF_TX_UNLOCK(ring) spin_unlock(&(ring)->lock)
#else
#define NETIF_TX_LOCK(ring)
#define NETIF_TX_UNLOCK(ring)
@@ -2075,7 +2076,7 @@ static void hns_nic_reset_subtask(struct hns_nic_priv *priv)
static void hns_nic_service_event_complete(struct hns_nic_priv *priv)
{
WARN_ON(!test_bit(NIC_STATE_SERVICE_SCHED, &priv->state));
-
+ /* make sure to commit the things */
smp_mb__before_atomic();
clear_bit(NIC_STATE_SERVICE_SCHED, &priv->state);
}
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
index 36f33bd..b8fab14 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -1242,7 +1242,6 @@ hns_set_rss(struct net_device *netdev, const u32 *indir, const u8 *key,
{
struct hns_nic_priv *priv = netdev_priv(netdev);
struct hnae_ae_ops *ops;
- int ret;
if (AE_IS_VER1(priv->enet_ver)) {
netdev_err(netdev,
--
2.7.4
next prev parent reply other threads:[~2017-03-30 15:33 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-30 15:30 [PATCH net 00/19] net: hns: Misc. HNS Bug Fixes & Code Improvements Salil Mehta
2017-03-30 15:30 ` [PATCH net 01/19] net: hns: Fix the implementation of irq affinity function Salil Mehta
2017-03-30 15:30 ` [PATCH net 02/19] net: hns: Modify GMAC init TX threshold value Salil Mehta
2017-03-30 15:30 ` [PATCH net 03/19] net: hns: Optimize the code for GMAC pad and crc Config Salil Mehta
2017-03-30 15:30 ` [PATCH net 04/19] net: hns: Change the TX queue selection algorithm Salil Mehta
2017-03-30 15:30 ` [PATCH net 05/19] net: hns: Remove redundant memset during buffer release Salil Mehta
2017-03-30 15:30 ` [PATCH net 06/19] net: hns: bug fix of ethtool show the speed Salil Mehta
2017-03-30 15:30 ` [PATCH net 07/19] net: hns: Optimize hns_nic_common_poll for better performance Salil Mehta
2017-03-30 15:30 ` [PATCH net 08/19] net: hns: Fix to adjust buf_size of ring according to mtu Salil Mehta
2017-03-31 23:50 ` kbuild test robot
2017-03-31 23:50 ` [PATCH] net: hns: fix boolreturn.cocci warnings kbuild test robot
2017-04-03 2:44 ` David Miller
2017-04-03 2:52 ` [kbuild-all] " Fengguang Wu
2017-03-30 15:30 ` [PATCH net 09/19] net: hns: Replace netif_tx_lock to ring spin lock Salil Mehta
2017-03-30 15:30 ` [PATCH net 10/19] net: hns: Correct HNS RSS key set function Salil Mehta
2017-03-30 15:30 ` [PATCH net 11/19] net: hns: Remove the redundant adding and deleting mac function Salil Mehta
2017-03-30 15:30 ` [PATCH net 12/19] net: hns: Remove redundant mac_get_id() Salil Mehta
2017-03-30 15:31 ` [PATCH net 13/19] net: hns: Remove redundant mac table operations Salil Mehta
2017-03-30 15:31 ` [PATCH net 14/19] net: hns: Clean redundant code from hns_mdio.c file Salil Mehta
2017-03-30 15:31 ` [PATCH net 15/19] net: hns: Optimise the code in hns_mdio_wait_ready() Salil Mehta
2017-03-30 15:31 ` [PATCH net 16/19] net: hns: Simplify the exception sequence in hns_ppe_init() Salil Mehta
2017-03-30 15:31 ` [PATCH net 17/19] net: hns: Adjust the SBM module buffer threshold Salil Mehta
2017-03-30 15:31 ` [PATCH net 18/19] net: hns: Avoid Hip06 chip TX packet line bug Salil Mehta
2017-03-30 15:31 ` Salil Mehta [this message]
2017-03-30 17:08 ` [PATCH net 00/19] net: hns: Misc. HNS Bug Fixes & Code Improvements David Miller
2017-03-30 17:19 ` Salil Mehta
2017-03-30 17:22 ` David Miller
2017-03-30 17:23 ` Salil Mehta
2017-03-31 3:03 ` David Miller
2017-03-31 9:58 ` Salil Mehta
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=20170330153106.14344-20-salil.mehta@huawei.com \
--to=salil.mehta@huawei.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mehta.salil.lnk@gmail.com \
--cc=netdev@vger.kernel.org \
--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
all inboxes | Powered by JetHome®