* [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01
@ 2019-08-01 22:25 Jeff Kirsher
2019-08-01 22:25 ` [net-next 01/11] fm10k: reduce scope of the err variable Jeff Kirsher
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: Jeff Kirsher @ 2019-08-01 22:25 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, nhorman, sassmann
This series for fm10k, by Jake Keller, reduces the scope of local variables
where possible.
The following are changes since commit a8e600e2184f45c40025cbe4d7e8893b69378a9f:
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 100GbE
Jacob Keller (11):
fm10k: reduce scope of the err variable
fm10k: reduce scope of *p local variable
fm10k: reduce the scope of qv local variable
fm10k: reduce the scope of local err variable
fm10k: reduce the scope of the q_idx local variable
fm10k: reduce the scope of the tx_buffer variable
fm10k: reduce the scope of the err variable
fm10k: reduce the scope of the local i variable
fm10k: reduce the scope of the local msg variable
fm10k: reduce the scope of the result local variable
fm10k: reduce scope of the ring variable
drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c | 6 +++---
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 9 ++++-----
drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 5 +++--
drivers/net/ethernet/intel/fm10k/fm10k_main.c | 9 +++++----
drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 6 ++++--
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 8 ++++----
drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 9 +++++----
drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 3 +--
8 files changed, 29 insertions(+), 26 deletions(-)
--
2.21.0
^ permalink raw reply [flat|nested] 13+ messages in thread
* [net-next 01/11] fm10k: reduce scope of the err variable
2019-08-01 22:25 [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 Jeff Kirsher
@ 2019-08-01 22:25 ` Jeff Kirsher
2019-08-01 22:25 ` [net-next 02/11] fm10k: reduce scope of *p local variable Jeff Kirsher
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jeff Kirsher @ 2019-08-01 22:25 UTC (permalink / raw)
To: davem
Cc: Jacob Keller, netdev, nhorman, sassmann, Andrew Bowers, Jeff Kirsher
From: Jacob Keller <jacob.e.keller@intel.com>
Reduce the scope of the err local variable in the fm10k_dcbnl_ieee_setets
function.
This was detected using cppcheck, and resolves the following style
warning:
[fm10k_dcbnl.c:37]: (style) The scope of the variable 'err' can be reduced.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c b/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c
index 20768ac7f17e..c45315472245 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright(c) 2013 - 2018 Intel Corporation. */
+/* Copyright(c) 2013 - 2019 Intel Corporation. */
#include "fm10k.h"
@@ -36,7 +36,7 @@ static int fm10k_dcbnl_ieee_getets(struct net_device *dev, struct ieee_ets *ets)
static int fm10k_dcbnl_ieee_setets(struct net_device *dev, struct ieee_ets *ets)
{
u8 num_tc = 0;
- int i, err;
+ int i;
/* verify type and determine num_tcs needed */
for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
@@ -57,7 +57,7 @@ static int fm10k_dcbnl_ieee_setets(struct net_device *dev, struct ieee_ets *ets)
/* update TC hardware mapping if necessary */
if (num_tc != netdev_get_num_tc(dev)) {
- err = fm10k_setup_tc(dev, num_tc);
+ int err = fm10k_setup_tc(dev, num_tc);
if (err)
return err;
}
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-next 02/11] fm10k: reduce scope of *p local variable
2019-08-01 22:25 [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 Jeff Kirsher
2019-08-01 22:25 ` [net-next 01/11] fm10k: reduce scope of the err variable Jeff Kirsher
@ 2019-08-01 22:25 ` Jeff Kirsher
2019-08-01 22:25 ` [net-next 03/11] fm10k: reduce the scope of qv " Jeff Kirsher
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jeff Kirsher @ 2019-08-01 22:25 UTC (permalink / raw)
To: davem
Cc: Jacob Keller, netdev, nhorman, sassmann, Andrew Bowers, Jeff Kirsher
From: Jacob Keller <jacob.e.keller@intel.com>
Reduce the scope of the char *p local variable to only the block where
it is used.
This was detected by cppcheck and resolves the following style warning
produced by that tool:
[fm10k_ethtool.c:229]: (style) The scope of the variable 'p' can be
reduced.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
index 4895dd83dd08..7b9440c0aee1 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright(c) 2013 - 2018 Intel Corporation. */
+/* Copyright(c) 2013 - 2019 Intel Corporation. */
#include <linux/vmalloc.h>
@@ -222,7 +222,6 @@ static void __fm10k_add_ethtool_stats(u64 **data, void *pointer,
const unsigned int size)
{
unsigned int i;
- char *p;
if (!pointer) {
/* memory is not zero allocated so we have to clear it */
@@ -232,7 +231,7 @@ static void __fm10k_add_ethtool_stats(u64 **data, void *pointer,
}
for (i = 0; i < size; i++) {
- p = (char *)pointer + stats[i].stat_offset;
+ char *p = (char *)pointer + stats[i].stat_offset;
switch (stats[i].sizeof_stat) {
case sizeof(u64):
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-next 03/11] fm10k: reduce the scope of qv local variable
2019-08-01 22:25 [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 Jeff Kirsher
2019-08-01 22:25 ` [net-next 01/11] fm10k: reduce scope of the err variable Jeff Kirsher
2019-08-01 22:25 ` [net-next 02/11] fm10k: reduce scope of *p local variable Jeff Kirsher
@ 2019-08-01 22:25 ` Jeff Kirsher
2019-08-01 22:25 ` [net-next 04/11] fm10k: reduce the scope of local err variable Jeff Kirsher
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jeff Kirsher @ 2019-08-01 22:25 UTC (permalink / raw)
To: davem
Cc: Jacob Keller, netdev, nhorman, sassmann, Andrew Bowers, Jeff Kirsher
From: Jacob Keller <jacob.e.keller@intel.com>
Reduce the scope of the qv vector pointer local variable in the
fm10k_set_coalesce function.
This was detected by cppcheck and resolves the following style warning
produced by that tool:
[fm10k_ethtool.c:658]: (style) The scope of the variable 'qv' can be
reduced.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
index 7b9440c0aee1..1f7e4a8f4557 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
@@ -650,7 +650,6 @@ static int fm10k_set_coalesce(struct net_device *dev,
struct ethtool_coalesce *ec)
{
struct fm10k_intfc *interface = netdev_priv(dev);
- struct fm10k_q_vector *qv;
u16 tx_itr, rx_itr;
int i;
@@ -676,7 +675,8 @@ static int fm10k_set_coalesce(struct net_device *dev,
/* update q_vectors */
for (i = 0; i < interface->num_q_vectors; i++) {
- qv = interface->q_vector[i];
+ struct fm10k_q_vector *qv = interface->q_vector[i];
+
qv->tx.itr = tx_itr;
qv->rx.itr = rx_itr;
}
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-next 04/11] fm10k: reduce the scope of local err variable
2019-08-01 22:25 [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 Jeff Kirsher
` (2 preceding siblings ...)
2019-08-01 22:25 ` [net-next 03/11] fm10k: reduce the scope of qv " Jeff Kirsher
@ 2019-08-01 22:25 ` Jeff Kirsher
2019-08-01 22:25 ` [net-next 05/11] fm10k: reduce the scope of the q_idx local variable Jeff Kirsher
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jeff Kirsher @ 2019-08-01 22:25 UTC (permalink / raw)
To: davem
Cc: Jacob Keller, netdev, nhorman, sassmann, Andrew Bowers, Jeff Kirsher
From: Jacob Keller <jacob.e.keller@intel.com>
Reduce the scope of the local err variable in the fm10k_iov_alloc_data
function.
This was detected by cppcheck and resolves the following style warning
produced by that tool:
[fm10k_iov.c:426]: (style) The scope of the variable 'err' can be reduced.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
index 8de77155f2e7..afe1fafd2447 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright(c) 2013 - 2018 Intel Corporation. */
+/* Copyright(c) 2013 - 2019 Intel Corporation. */
#include "fm10k.h"
#include "fm10k_vf.h"
@@ -426,7 +426,7 @@ static s32 fm10k_iov_alloc_data(struct pci_dev *pdev, int num_vfs)
struct fm10k_iov_data *iov_data = interface->iov_data;
struct fm10k_hw *hw = &interface->hw;
size_t size;
- int i, err;
+ int i;
/* return error if iov_data is already populated */
if (iov_data)
@@ -452,6 +452,7 @@ static s32 fm10k_iov_alloc_data(struct pci_dev *pdev, int num_vfs)
/* loop through vf_info structures initializing each entry */
for (i = 0; i < num_vfs; i++) {
struct fm10k_vf_info *vf_info = &iov_data->vf_info[i];
+ int err;
/* Record VF VSI value */
vf_info->vsi = i + 1;
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-next 05/11] fm10k: reduce the scope of the q_idx local variable
2019-08-01 22:25 [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 Jeff Kirsher
` (3 preceding siblings ...)
2019-08-01 22:25 ` [net-next 04/11] fm10k: reduce the scope of local err variable Jeff Kirsher
@ 2019-08-01 22:25 ` Jeff Kirsher
2019-08-01 22:25 ` [net-next 06/11] fm10k: reduce the scope of the tx_buffer variable Jeff Kirsher
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jeff Kirsher @ 2019-08-01 22:25 UTC (permalink / raw)
To: davem
Cc: Jacob Keller, netdev, nhorman, sassmann, Andrew Bowers, Jeff Kirsher
From: Jacob Keller <jacob.e.keller@intel.com>
Reduce the scope of the q_idx local variable in the fm10k_cache_ring_qos
function.
This was detected by cppcheck and resolves the following style warning
produced by that tool:
[fm10k_main.c:2016]: (style) The scope of the variable 'q_idx' can be
reduced.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_main.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 9ffff7886085..9e6bddff7625 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright(c) 2013 - 2018 Intel Corporation. */
+/* Copyright(c) 2013 - 2019 Intel Corporation. */
#include <linux/types.h>
#include <linux/module.h>
@@ -17,7 +17,7 @@ const char fm10k_driver_version[] = DRV_VERSION;
char fm10k_driver_name[] = "fm10k";
static const char fm10k_driver_string[] = DRV_SUMMARY;
static const char fm10k_copyright[] =
- "Copyright(c) 2013 - 2018 Intel Corporation.";
+ "Copyright(c) 2013 - 2019 Intel Corporation.";
MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
MODULE_DESCRIPTION(DRV_SUMMARY);
@@ -1870,7 +1870,7 @@ static int fm10k_init_msix_capability(struct fm10k_intfc *interface)
static bool fm10k_cache_ring_qos(struct fm10k_intfc *interface)
{
struct net_device *dev = interface->netdev;
- int pc, offset, rss_i, i, q_idx;
+ int pc, offset, rss_i, i;
u16 pc_stride = interface->ring_feature[RING_F_QOS].mask + 1;
u8 num_pcs = netdev_get_num_tc(dev);
@@ -1880,7 +1880,8 @@ static bool fm10k_cache_ring_qos(struct fm10k_intfc *interface)
rss_i = interface->ring_feature[RING_F_RSS].indices;
for (pc = 0, offset = 0; pc < num_pcs; pc++, offset += rss_i) {
- q_idx = pc;
+ int q_idx = pc;
+
for (i = 0; i < rss_i; i++) {
interface->tx_ring[offset + i]->reg_idx = q_idx;
interface->tx_ring[offset + i]->qos_pc = pc;
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-next 06/11] fm10k: reduce the scope of the tx_buffer variable
2019-08-01 22:25 [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 Jeff Kirsher
` (4 preceding siblings ...)
2019-08-01 22:25 ` [net-next 05/11] fm10k: reduce the scope of the q_idx local variable Jeff Kirsher
@ 2019-08-01 22:25 ` Jeff Kirsher
2019-08-01 22:25 ` [net-next 07/11] fm10k: reduce the scope of the err variable Jeff Kirsher
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jeff Kirsher @ 2019-08-01 22:25 UTC (permalink / raw)
To: davem
Cc: Jacob Keller, netdev, nhorman, sassmann, Andrew Bowers, Jeff Kirsher
From: Jacob Keller <jacob.e.keller@intel.com>
The tx_buffer local variable in the function fm10k_clean_tx_ring is not
used except inside a smaller block scope. Reduce the scope to its point
of use.
This was detected by cppcheck and resolves the following style warning
produced by that tool:
[fm10k_netdev.c:179]: (style) The scope of the variable 'tx_buffer' can
be reduced.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index 538a8467f434..c73fb38be678 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
@@ -169,7 +169,6 @@ void fm10k_unmap_and_free_tx_resource(struct fm10k_ring *ring,
**/
static void fm10k_clean_tx_ring(struct fm10k_ring *tx_ring)
{
- struct fm10k_tx_buffer *tx_buffer;
unsigned long size;
u16 i;
@@ -179,7 +178,8 @@ static void fm10k_clean_tx_ring(struct fm10k_ring *tx_ring)
/* Free all the Tx ring sk_buffs */
for (i = 0; i < tx_ring->count; i++) {
- tx_buffer = &tx_ring->tx_buffer[i];
+ struct fm10k_tx_buffer *tx_buffer = &tx_ring->tx_buffer[i];
+
fm10k_unmap_and_free_tx_resource(tx_ring, tx_buffer);
}
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-next 07/11] fm10k: reduce the scope of the err variable
2019-08-01 22:25 [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 Jeff Kirsher
` (5 preceding siblings ...)
2019-08-01 22:25 ` [net-next 06/11] fm10k: reduce the scope of the tx_buffer variable Jeff Kirsher
@ 2019-08-01 22:25 ` Jeff Kirsher
2019-08-01 22:25 ` [net-next 08/11] fm10k: reduce the scope of the local i variable Jeff Kirsher
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jeff Kirsher @ 2019-08-01 22:25 UTC (permalink / raw)
To: davem
Cc: Jacob Keller, netdev, nhorman, sassmann, Andrew Bowers, Jeff Kirsher
From: Jacob Keller <jacob.e.keller@intel.com>
Reduce the scope of the local variable err in the fm10k_detach_subtask
function.
This was detected by cppcheck and resolves the following warning
produced by that tool:
[fm10k_pci.c:403]: (style) The scope of the variable 'err' can be reduced.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index 7bfc8a5b6f55..9421832c2480 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright(c) 2013 - 2018 Intel Corporation. */
+/* Copyright(c) 2013 - 2019 Intel Corporation. */
#include <linux/module.h>
#include <linux/interrupt.h>
@@ -344,7 +344,6 @@ static void fm10k_detach_subtask(struct fm10k_intfc *interface)
struct net_device *netdev = interface->netdev;
u32 __iomem *hw_addr;
u32 value;
- int err;
/* do nothing if netdev is still present or hw_addr is set */
if (netif_device_present(netdev) || interface->hw.hw_addr)
@@ -362,6 +361,8 @@ static void fm10k_detach_subtask(struct fm10k_intfc *interface)
hw_addr = READ_ONCE(interface->uc_addr);
value = readl(hw_addr);
if (~value) {
+ int err;
+
/* Make sure the reset was initiated because we detached,
* otherwise we might race with a different reset flow.
*/
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-next 08/11] fm10k: reduce the scope of the local i variable
2019-08-01 22:25 [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 Jeff Kirsher
` (6 preceding siblings ...)
2019-08-01 22:25 ` [net-next 07/11] fm10k: reduce the scope of the err variable Jeff Kirsher
@ 2019-08-01 22:25 ` Jeff Kirsher
2019-08-01 22:25 ` [net-next 09/11] fm10k: reduce the scope of the local msg variable Jeff Kirsher
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jeff Kirsher @ 2019-08-01 22:25 UTC (permalink / raw)
To: davem
Cc: Jacob Keller, netdev, nhorman, sassmann, Andrew Bowers, Jeff Kirsher
From: Jacob Keller <jacob.e.keller@intel.com>
Reduce the scope of the local loop variable in the
fm10k_check_hang_subtask function.
This was detected by cppcheck and resolves the following warning
produced by that tool:
[driver/fm10k_pci.c:852]: (style) The scope of the variable 'i' can be
reduced.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index 9421832c2480..9522e9f8f8b8 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -698,8 +698,6 @@ static void fm10k_watchdog_subtask(struct fm10k_intfc *interface)
*/
static void fm10k_check_hang_subtask(struct fm10k_intfc *interface)
{
- int i;
-
/* If we're down or resetting, just bail */
if (test_bit(__FM10K_DOWN, interface->state) ||
test_bit(__FM10K_RESETTING, interface->state))
@@ -711,6 +709,8 @@ static void fm10k_check_hang_subtask(struct fm10k_intfc *interface)
interface->next_tx_hang_check = jiffies + (2 * HZ);
if (netif_carrier_ok(interface->netdev)) {
+ int i;
+
/* Force detection of hung controller */
for (i = 0; i < interface->num_tx_queues; i++)
set_check_for_tx_hang(interface->tx_ring[i]);
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-next 09/11] fm10k: reduce the scope of the local msg variable
2019-08-01 22:25 [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 Jeff Kirsher
` (7 preceding siblings ...)
2019-08-01 22:25 ` [net-next 08/11] fm10k: reduce the scope of the local i variable Jeff Kirsher
@ 2019-08-01 22:25 ` Jeff Kirsher
2019-08-01 22:25 ` [net-next 10/11] fm10k: reduce the scope of the result local variable Jeff Kirsher
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Jeff Kirsher @ 2019-08-01 22:25 UTC (permalink / raw)
To: davem
Cc: Jacob Keller, netdev, nhorman, sassmann, Andrew Bowers, Jeff Kirsher
From: Jacob Keller <jacob.e.keller@intel.com>
The msg variable in the fm10k_mbx_validate_msg_size and
fm10k_sm_mbx_transmit functions is only used within the do {} loop
scope. Reduce its scope only to where it is used.
This was detected by cppcheck, and resolves the following warnings
produced by that tool:
[fm10k_mbx.c:299]: (style) The scope of the variable 'msg' can be reduced.
[fm10k_mbx.c:2004]: (style) The scope of the variable 'msg' can be reduced.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c b/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
index 21021fe4f1c3..aece335b41f8 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
@@ -297,13 +297,14 @@ static u16 fm10k_mbx_validate_msg_size(struct fm10k_mbx_info *mbx, u16 len)
{
struct fm10k_mbx_fifo *fifo = &mbx->rx;
u16 total_len = 0, msg_len;
- u32 *msg;
/* length should include previous amounts pushed */
len += mbx->pushed;
/* offset in message is based off of current message size */
do {
+ u32 *msg;
+
msg = fifo->buffer + fm10k_fifo_tail_offset(fifo, total_len);
msg_len = FM10K_TLV_DWORD_LEN(*msg);
total_len += msg_len;
@@ -1920,7 +1921,6 @@ static void fm10k_sm_mbx_transmit(struct fm10k_hw *hw,
/* reduce length by 1 to convert to a mask */
u16 mbmem_len = mbx->mbmem_len - 1;
u16 tail_len, len = 0;
- u32 *msg;
/* push head behind tail */
if (mbx->tail < head)
@@ -1930,6 +1930,8 @@ static void fm10k_sm_mbx_transmit(struct fm10k_hw *hw,
/* determine msg aligned offset for end of buffer */
do {
+ u32 *msg;
+
msg = fifo->buffer + fm10k_fifo_head_offset(fifo, len);
tail_len = len;
len += FM10K_TLV_DWORD_LEN(*msg);
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-next 10/11] fm10k: reduce the scope of the result local variable
2019-08-01 22:25 [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 Jeff Kirsher
` (8 preceding siblings ...)
2019-08-01 22:25 ` [net-next 09/11] fm10k: reduce the scope of the local msg variable Jeff Kirsher
@ 2019-08-01 22:25 ` Jeff Kirsher
2019-08-01 22:25 ` [net-next 11/11] fm10k: reduce scope of the ring variable Jeff Kirsher
2019-08-03 17:40 ` [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 David Miller
11 siblings, 0 replies; 13+ messages in thread
From: Jeff Kirsher @ 2019-08-01 22:25 UTC (permalink / raw)
To: davem
Cc: Jacob Keller, netdev, nhorman, sassmann, Andrew Bowers, Jeff Kirsher
From: Jacob Keller <jacob.e.keller@intel.com>
Reduce the scope of the result local variable in the
fm10k_iov_msg_lport_state_pf function.
This was detected by cppcheck and resolves the following warning
produced by that tool:
[fm10k_pf.c:1435]: (style) The scope of the variable 'result' can be
reduced.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
index cb4d02629b86..e85b2f2eef05 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
@@ -1352,7 +1352,6 @@ s32 fm10k_iov_msg_lport_state_pf(struct fm10k_hw *hw, u32 **results,
struct fm10k_mbx_info *mbx)
{
struct fm10k_vf_info *vf_info = (struct fm10k_vf_info *)mbx;
- u32 *result;
s32 err = 0;
u32 msg[2];
u8 mode = 0;
@@ -1362,7 +1361,7 @@ s32 fm10k_iov_msg_lport_state_pf(struct fm10k_hw *hw, u32 **results,
return FM10K_ERR_PARAM;
if (!!results[FM10K_LPORT_STATE_MSG_XCAST_MODE]) {
- result = results[FM10K_LPORT_STATE_MSG_XCAST_MODE];
+ u32 *result = results[FM10K_LPORT_STATE_MSG_XCAST_MODE];
/* XCAST mode update requested */
err = fm10k_tlv_attr_get_u8(result, &mode);
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-next 11/11] fm10k: reduce scope of the ring variable
2019-08-01 22:25 [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 Jeff Kirsher
` (9 preceding siblings ...)
2019-08-01 22:25 ` [net-next 10/11] fm10k: reduce the scope of the result local variable Jeff Kirsher
@ 2019-08-01 22:25 ` Jeff Kirsher
2019-08-03 17:40 ` [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 David Miller
11 siblings, 0 replies; 13+ messages in thread
From: Jeff Kirsher @ 2019-08-01 22:25 UTC (permalink / raw)
To: davem
Cc: Jacob Keller, netdev, nhorman, sassmann, Andrew Bowers, Jeff Kirsher
From: Jacob Keller <jacob.e.keller@intel.com>
Reduce the scope of the ring local variable in the fm10k_assign_l2_accel
function.
This was detected by cppcheck and resolves the following warning
produced by that tool:
[fm10k_netdev.c:1447]: (style) The scope of the variable 'ring' can be
reduced.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index c73fb38be678..259da075093f 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
@@ -1444,11 +1444,11 @@ static int __fm10k_setup_tc(struct net_device *dev, enum tc_setup_type type,
static void fm10k_assign_l2_accel(struct fm10k_intfc *interface,
struct fm10k_l2_accel *l2_accel)
{
- struct fm10k_ring *ring;
int i;
for (i = 0; i < interface->num_rx_queues; i++) {
- ring = interface->rx_ring[i];
+ struct fm10k_ring *ring = interface->rx_ring[i];
+
rcu_assign_pointer(ring->l2_accel, l2_accel);
}
--
2.21.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01
2019-08-01 22:25 [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 Jeff Kirsher
` (10 preceding siblings ...)
2019-08-01 22:25 ` [net-next 11/11] fm10k: reduce scope of the ring variable Jeff Kirsher
@ 2019-08-03 17:40 ` David Miller
11 siblings, 0 replies; 13+ messages in thread
From: David Miller @ 2019-08-03 17:40 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, nhorman, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 1 Aug 2019 15:25:37 -0700
> This series for fm10k, by Jake Keller, reduces the scope of local variables
> where possible.
>
> The following are changes since commit a8e600e2184f45c40025cbe4d7e8893b69378a9f:
> Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 100GbE
Pulled, thanks Jeff.
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2019-08-03 17:40 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-01 22:25 [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 Jeff Kirsher
2019-08-01 22:25 ` [net-next 01/11] fm10k: reduce scope of the err variable Jeff Kirsher
2019-08-01 22:25 ` [net-next 02/11] fm10k: reduce scope of *p local variable Jeff Kirsher
2019-08-01 22:25 ` [net-next 03/11] fm10k: reduce the scope of qv " Jeff Kirsher
2019-08-01 22:25 ` [net-next 04/11] fm10k: reduce the scope of local err variable Jeff Kirsher
2019-08-01 22:25 ` [net-next 05/11] fm10k: reduce the scope of the q_idx local variable Jeff Kirsher
2019-08-01 22:25 ` [net-next 06/11] fm10k: reduce the scope of the tx_buffer variable Jeff Kirsher
2019-08-01 22:25 ` [net-next 07/11] fm10k: reduce the scope of the err variable Jeff Kirsher
2019-08-01 22:25 ` [net-next 08/11] fm10k: reduce the scope of the local i variable Jeff Kirsher
2019-08-01 22:25 ` [net-next 09/11] fm10k: reduce the scope of the local msg variable Jeff Kirsher
2019-08-01 22:25 ` [net-next 10/11] fm10k: reduce the scope of the result local variable Jeff Kirsher
2019-08-01 22:25 ` [net-next 11/11] fm10k: reduce scope of the ring variable Jeff Kirsher
2019-08-03 17:40 ` [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2019-08-01 David Miller
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).