fm10k: remove needless assignment of err local variable (4d12002f) · Commits · 戴 / test

The local variable err in several functions in the fm10k_netdev.c file is initialized with a value that is never used. The err value is immediately re-assigned in all cases where it will be checked. Remove the unnecessary initializers. This was detected by cppcheck and resolves the following warnings produced by that tool: [fm10k_netdev.c:999] -> [fm10k_netdev.c:1004]: (style) Variable 'err' is reassigned a value before the old one has been used. [fm10k_netdev.c:1019] -> [fm10k_netdev.c:1024]: (style) Variable 'err' is reassigned a value before the old one has been used. [fm10k_netdev.c:64]: (style) Variable 'err' is assigned a value that is never used. [fm10k_netdev.c:131]: (style) Variable 'err' is assigned a value that is never used. 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

+5 −5

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/* Copyright(c) 2013 - 2018 Intel Corporation. */
		/* Copyright(c) 2013 - 2019 Intel Corporation. */

		#include "fm10k.h"
		#include <linux/vmalloc.h>
		@@ -54,7 +54,7 @@ err:
		**/
		static int fm10k_setup_all_tx_resources(struct fm10k_intfc *interface)
		{
		int i, err = 0;
		int i, err;

		for (i = 0; i < interface->num_tx_queues; i++) {
		err = fm10k_setup_tx_resources(interface->tx_ring[i]);
		@@ -121,7 +121,7 @@ err:
		**/
		static int fm10k_setup_all_rx_resources(struct fm10k_intfc *interface)
		{
		int i, err = 0;
		int i, err;

		for (i = 0; i < interface->num_rx_queues; i++) {
		err = fm10k_setup_rx_resources(interface->rx_ring[i]);
		@@ -871,7 +871,7 @@ static int fm10k_uc_vlan_unsync(struct net_device *netdev,
		u16 glort = interface->glort;
		u16 vid = interface->vid;
		bool set = !!(vid / VLAN_N_VID);
		int err = -EHOSTDOWN;
		int err;

		/* drop any leading bits on the VLAN ID */
		vid &= VLAN_N_VID - 1;
		@@ -891,7 +891,7 @@ static int fm10k_mc_vlan_unsync(struct net_device *netdev,
		u16 glort = interface->glort;
		u16 vid = interface->vid;
		bool set = !!(vid / VLAN_N_VID);
		int err = -EHOSTDOWN;
		int err;

		/* drop any leading bits on the VLAN ID */
		vid &= VLAN_N_VID - 1;

Admin message