]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
fm10k: reduce scope of the err variable
authorJacob Keller <jacob.e.keller@intel.com>
Mon, 8 Jul 2019 23:12:18 +0000 (16:12 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 1 Aug 2019 20:57:33 +0000 (13:57 -0700)
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

index 20768ac7f17eb9836ab248cd9e8994b39ea3bb0e..c45315472245978020303073d12ad065c6bb151a 100644 (file)
@@ -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;
        }