|
Michal Suchanek |
f2798b |
From 91dc5d2553fbf20e2e8384ac997f278a50c70561 Mon Sep 17 00:00:00 2001
|
|
Michal Suchanek |
f2798b |
From: Lijun Pan <lijunp213@gmail.com>
|
|
Michal Suchanek |
f2798b |
Date: Thu, 11 Feb 2021 00:43:22 -0600
|
|
Michal Suchanek |
f2798b |
Subject: [PATCH] ibmvnic: fix miscellaneous checks
|
|
Michal Suchanek |
f2798b |
|
|
Michal Suchanek |
f2798b |
References: bsc#1184114 ltc#192237 bsc#1183871 ltc#192139
|
|
Michal Suchanek |
f2798b |
Patch-mainline: v5.12-rc1
|
|
Michal Suchanek |
f2798b |
Git-commit: 91dc5d2553fbf20e2e8384ac997f278a50c70561
|
|
Michal Suchanek |
f2798b |
|
|
Michal Suchanek |
f2798b |
Fix the following checkpatch checks:
|
|
Michal Suchanek |
f2798b |
CHECK: Macro argument 'off' may be better as '(off)' to
|
|
Michal Suchanek |
f2798b |
avoid precedence issues
|
|
Michal Suchanek |
f2798b |
CHECK: Alignment should match open parenthesis
|
|
Michal Suchanek |
f2798b |
CHECK: multiple assignments should be avoided
|
|
Michal Suchanek |
f2798b |
CHECK: Blank lines aren't necessary before a close brace '}'
|
|
Michal Suchanek |
f2798b |
CHECK: Please use a blank line after function/struct/union/enum
|
|
Michal Suchanek |
f2798b |
declarations
|
|
Michal Suchanek |
f2798b |
CHECK: Unnecessary parentheses around 'rc != H_FUNCTION'
|
|
Michal Suchanek |
f2798b |
|
|
Michal Suchanek |
f2798b |
Signed-off-by: Lijun Pan <lijunp213@gmail.com>
|
|
Michal Suchanek |
f2798b |
Reviewed-by: Saeed Mahameed <saeedm@nvidia.com>
|
|
Michal Suchanek |
f2798b |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Michal Suchanek |
f2798b |
Acked-by: Michal Suchanek <msuchanek@suse.de>
|
|
Michal Suchanek |
f2798b |
---
|
|
Michal Suchanek |
f2798b |
drivers/net/ethernet/ibm/ibmvnic.c | 17 +++++++++--------
|
|
Michal Suchanek |
f2798b |
1 file changed, 9 insertions(+), 8 deletions(-)
|
|
Michal Suchanek |
f2798b |
|
|
Michal Suchanek |
f2798b |
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
|
|
Michal Suchanek |
f2798b |
index 67b09a53d7ac..0c27a1f9663a 100644
|
|
Michal Suchanek |
f2798b |
--- a/drivers/net/ethernet/ibm/ibmvnic.c
|
|
Michal Suchanek |
f2798b |
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
|
|
Michal Suchanek |
f2798b |
@@ -115,7 +115,7 @@ struct ibmvnic_stat {
|
|
Michal Suchanek |
f2798b |
|
|
Michal Suchanek |
f2798b |
#define IBMVNIC_STAT_OFF(stat) (offsetof(struct ibmvnic_adapter, stats) + \
|
|
Michal Suchanek |
f2798b |
offsetof(struct ibmvnic_statistics, stat))
|
|
Michal Suchanek |
f2798b |
-#define IBMVNIC_GET_STAT(a, off) (*((u64 *)(((unsigned long)(a)) + off)))
|
|
Michal Suchanek |
f2798b |
+#define IBMVNIC_GET_STAT(a, off) (*((u64 *)(((unsigned long)(a)) + (off))))
|
|
Michal Suchanek |
f2798b |
|
|
Michal Suchanek |
f2798b |
static const struct ibmvnic_stat ibmvnic_stats[] = {
|
|
Michal Suchanek |
f2798b |
{"rx_packets", IBMVNIC_STAT_OFF(rx_packets)},
|
|
Michal Suchanek |
f2798b |
@@ -2069,14 +2069,14 @@ static int do_reset(struct ibmvnic_adapter *adapter,
|
|
Michal Suchanek |
f2798b |
rc = reset_tx_pools(adapter);
|
|
Michal Suchanek |
f2798b |
if (rc) {
|
|
Michal Suchanek |
f2798b |
netdev_dbg(adapter->netdev, "reset tx pools failed (%d)\n",
|
|
Michal Suchanek |
f2798b |
- rc);
|
|
Michal Suchanek |
f2798b |
+ rc);
|
|
Michal Suchanek |
f2798b |
goto out;
|
|
Michal Suchanek |
f2798b |
}
|
|
Michal Suchanek |
f2798b |
|
|
Michal Suchanek |
f2798b |
rc = reset_rx_pools(adapter);
|
|
Michal Suchanek |
f2798b |
if (rc) {
|
|
Michal Suchanek |
f2798b |
netdev_dbg(adapter->netdev, "reset rx pools failed (%d)\n",
|
|
Michal Suchanek |
f2798b |
- rc);
|
|
Michal Suchanek |
f2798b |
+ rc);
|
|
Michal Suchanek |
f2798b |
goto out;
|
|
Michal Suchanek |
f2798b |
}
|
|
Michal Suchanek |
f2798b |
}
|
|
Michal Suchanek |
f2798b |
@@ -2333,7 +2333,8 @@ static int ibmvnic_reset(struct ibmvnic_adapter *adapter,
|
|
Michal Suchanek |
f2798b |
|
|
Michal Suchanek |
f2798b |
if (adapter->state == VNIC_PROBING) {
|
|
Michal Suchanek |
f2798b |
netdev_warn(netdev, "Adapter reset during probe\n");
|
|
Michal Suchanek |
f2798b |
- ret = adapter->init_done_rc = EAGAIN;
|
|
Michal Suchanek |
f2798b |
+ adapter->init_done_rc = EAGAIN;
|
|
Michal Suchanek |
f2798b |
+ ret = EAGAIN;
|
|
Michal Suchanek |
f2798b |
goto err;
|
|
Michal Suchanek |
f2798b |
}
|
|
Michal Suchanek |
f2798b |
|
|
Michal Suchanek |
f2798b |
@@ -2746,7 +2747,6 @@ static int ibmvnic_set_channels(struct net_device *netdev,
|
|
Michal Suchanek |
f2798b |
channels->rx_count, channels->tx_count,
|
|
Michal Suchanek |
f2798b |
adapter->req_rx_queues, adapter->req_tx_queues);
|
|
Michal Suchanek |
f2798b |
return ret;
|
|
Michal Suchanek |
f2798b |
-
|
|
Michal Suchanek |
f2798b |
}
|
|
Michal Suchanek |
f2798b |
|
|
Michal Suchanek |
f2798b |
static void ibmvnic_get_strings(struct net_device *dev, u32 stringset, u8 *data)
|
|
Michal Suchanek |
f2798b |
@@ -2835,8 +2835,8 @@ static void ibmvnic_get_ethtool_stats(struct net_device *dev,
|
|
Michal Suchanek |
f2798b |
return;
|
|
Michal Suchanek |
f2798b |
|
|
Michal Suchanek |
f2798b |
for (i = 0; i < ARRAY_SIZE(ibmvnic_stats); i++)
|
|
Michal Suchanek |
f2798b |
- data[i] = be64_to_cpu(IBMVNIC_GET_STAT(adapter,
|
|
Michal Suchanek |
f2798b |
- ibmvnic_stats[i].offset));
|
|
Michal Suchanek |
f2798b |
+ data[i] = be64_to_cpu(IBMVNIC_GET_STAT
|
|
Michal Suchanek |
f2798b |
+ (adapter, ibmvnic_stats[i].offset));
|
|
Michal Suchanek |
f2798b |
|
|
Michal Suchanek |
f2798b |
for (j = 0; j < adapter->req_tx_queues; j++) {
|
|
Michal Suchanek |
f2798b |
data[i] = adapter->tx_stats_buffers[j].packets;
|
|
Michal Suchanek |
f2798b |
@@ -2876,6 +2876,7 @@ static int ibmvnic_set_priv_flags(struct net_device *netdev, u32 flags)
|
|
Michal Suchanek |
f2798b |
|
|
Michal Suchanek |
f2798b |
return 0;
|
|
Michal Suchanek |
f2798b |
}
|
|
Michal Suchanek |
f2798b |
+
|
|
Michal Suchanek |
f2798b |
static const struct ethtool_ops ibmvnic_ethtool_ops = {
|
|
Michal Suchanek |
f2798b |
.get_drvinfo = ibmvnic_get_drvinfo,
|
|
Michal Suchanek |
f2798b |
.get_msglevel = ibmvnic_get_msglevel,
|
|
Michal Suchanek |
f2798b |
@@ -3145,7 +3146,7 @@ static int enable_scrq_irq(struct ibmvnic_adapter *adapter,
|
|
Michal Suchanek |
f2798b |
/* H_EOI would fail with rc = H_FUNCTION when running
|
|
Michal Suchanek |
f2798b |
* in XIVE mode which is expected, but not an error.
|
|
Michal Suchanek |
f2798b |
*/
|
|
Michal Suchanek |
f2798b |
- if (rc && (rc != H_FUNCTION))
|
|
Michal Suchanek |
f2798b |
+ if (rc && rc != H_FUNCTION)
|
|
Michal Suchanek |
f2798b |
dev_err(dev, "H_EOI FAILED irq 0x%llx. rc=%ld\n",
|
|
Michal Suchanek |
f2798b |
val, rc);
|
|
Michal Suchanek |
f2798b |
}
|
|
Michal Suchanek |
f2798b |
--
|
|
Michal Suchanek |
f2798b |
2.26.2
|
|
Michal Suchanek |
f2798b |
|