Commit 5c3c0b21 authored Sep 25, 2020 by Jesse Brandeburg Committed by Greg Kroah-Hartman Jun 03, 2021

drivers/net/ethernet: clean up unused assignments



commit 7c8c0291f84027558bd5fca5729cbcf288c510f4 upstream.

As part of the W=1 compliation series, these lines all created
warnings about unused variables that were assigned a value. Most
of them are from register reads, but some are just picking up
a return value from a function and never doing anything with it.

Fixed warnings:
.../ethernet/brocade/bna/bnad.c:3280:6: warning: variable ‘rx_count’ set but not used [-Wunused-but-set-variable]
.../ethernet/brocade/bna/bnad.c:3280:6: warning: variable ‘rx_count’ set but not used [-Wunused-but-set-variable]
.../ethernet/cortina/gemini.c:512:6: warning: variable ‘val’ set but not used [-Wunused-but-set-variable]
.../ethernet/cortina/gemini.c:2110:21: warning: variable ‘config0’ set but not used [-Wunused-but-set-variable]
.../ethernet/cavium/liquidio/octeon_device.c:1327:6: warning: variable ‘val32’ set but not used [-Wunused-but-set-variable]
.../ethernet/cavium/liquidio/octeon_device.c:1358:6: warning: variable ‘val32’ set but not used [-Wunused-but-set-variable]
.../ethernet/dec/tulip/media.c:322:8: warning: variable ‘setup’ set but not used [-Wunused-but-set-variable]
.../ethernet/dec/tulip/de4x5.c:4928:13: warning: variable ‘r3’ set but not used [-Wunused-but-set-variable]
.../ethernet/micrel/ksz884x.c:1652:7: warning: variable ‘dummy’ set but not used [-Wunused-but-set-variable]
.../ethernet/micrel/ksz884x.c:1652:7: warning: variable ‘dummy’ set but not used [-Wunused-but-set-variable]
.../ethernet/micrel/ksz884x.c:1652:7: warning: variable ‘dummy’ set but not used [-Wunused-but-set-variable]
.../ethernet/micrel/ksz884x.c:1652:7: warning: variable ‘dummy’ set but not used [-Wunused-but-set-variable]
.../ethernet/micrel/ksz884x.c:4981:6: warning: variable ‘rx_status’ set but not used [-Wunused-but-set-variable]
.../ethernet/micrel/ksz884x.c:6510:6: warning: variable ‘rc’ set but not used [-Wunused-but-set-variable]
.../ethernet/micrel/ksz884x.c:6087: warning: cannot understand function prototype: 'struct hw_regs '
.../ethernet/microchip/lan743x_main.c:161:6: warning: variable ‘int_en’ set but not used [-Wunused-but-set-variable]
.../ethernet/microchip/lan743x_main.c:1702:6: warning: variable ‘int_sts’ set but not used [-Wunused-but-set-variable]
.../ethernet/microchip/lan743x_main.c:3041:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]
.../ethernet/natsemi/ns83820.c:603:6: warning: variable ‘tbisr’ set but not used [-Wunused-but-set-variable]
.../ethernet/natsemi/ns83820.c:1207:11: warning: variable ‘tanar’ set but not used [-Wunused-but-set-variable]
.../ethernet/marvell/mvneta.c:754:6: warning: variable ‘dummy’ set but not used [-Wunused-but-set-variable]
.../ethernet/neterion/vxge/vxge-traffic.c:33:6: warning: variable ‘val64’ set but not used [-Wunused-but-set-variable]
.../ethernet/neterion/vxge/vxge-traffic.c:160:6: warning: variable ‘val64’ set but not used [-Wunused-but-set-variable]
.../ethernet/neterion/vxge/vxge-traffic.c:490:6: warning: variable ‘val32’ set but not used [-Wunused-but-set-variable]
.../ethernet/neterion/vxge/vxge-traffic.c:2378:6: warning: variable ‘val64’ set but not used [-Wunused-but-set-variable]
.../ethernet/packetengines/yellowfin.c:1063:18: warning: variable ‘yf_size’ set but not used [-Wunused-but-set-variable]
.../ethernet/realtek/8139cp.c:1242:6: warning: variable ‘rc’ set but not used [-Wunused-but-set-variable]
.../ethernet/mellanox/mlx4/en_tx.c:858:6: warning: variable ‘ring_cons’ set but not used [-Wunused-but-set-variable]
.../ethernet/sis/sis900.c:792:6: warning: variable ‘status’ set but not used [-Wunused-but-set-variable]
.../ethernet/sfc/falcon/farch.c:878:11: warning: variable ‘rx_ev_pkt_type’ set but not used [-Wunused-but-set-variable]
.../ethernet/sfc/falcon/farch.c:877:23: warning: variable ‘rx_ev_mcast_pkt’ set but not used [-Wunused-but-set-variable]
.../ethernet/sfc/falcon/farch.c:877:7: warning: variable ‘rx_ev_hdr_type’ set but not used [-Wunused-but-set-variable]
.../ethernet/sfc/falcon/farch.c:876:7: warning: variable ‘rx_ev_other_err’ set but not used [-Wunused-but-set-variable]
.../ethernet/sfc/falcon/farch.c:1646:21: warning: variable ‘buftbl_min’ set but not used [-Wunused-but-set-variable]
.../ethernet/sfc/falcon/farch.c:2535:32: warning: variable ‘spec’ set but not used [-Wunused-but-set-variable]
.../ethernet/via/via-velocity.c:880:6: warning: variable ‘curr_status’ set but not used [-Wunused-but-set-variable]
.../ethernet/ti/tlan.c:656:6: warning: variable ‘rc’ set but not used [-Wunused-but-set-variable]
.../ethernet/ti/davinci_emac.c:1230:6: warning: variable ‘num_tx_pkts’ set but not used [-Wunused-but-set-variable]
.../ethernet/synopsys/dwc-xlgmac-common.c:516:8: warning: variable ‘str’ set but not used [-Wunused-but-set-variable]
.../ethernet/ti/cpsw_new.c:1662:22: warning: variable ‘priv’ set but not used [-Wunused-but-set-variable]

The register reads should be OK, because the current
implementation of readl and friends will always execute even
without an lvalue.

When it makes sense, just remove the lvalue assignment and the
local. Other times, just remove the offending code, and
occasionally, just mark the variable as maybe unused since it
could be used in an ifdef or debug scenario.

Only compile tested with W=1.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Acked-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[fixes gcc-11 build warnings - gregkh]
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a92212ef

drivers/net/ethernet/brocade/bna/bnad.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -3290,7 +3290,7 @@ bnad_change_mtu(struct net_device *netdev, int new_mtu)
		{
		int err, mtu;
		struct bnad *bnad = netdev_priv(netdev);
		u32 rx_count = 0, frame, new_frame;
		u32 frame, new_frame;

		mutex_lock(&bnad->conf_mutex);

		@@ -3306,12 +3306,9 @@ bnad_change_mtu(struct net_device *netdev, int new_mtu)
		/* only when transition is over 4K */
		if ((frame <= 4096 && new_frame > 4096) \|\|
		(frame > 4096 && new_frame <= 4096))
		rx_count = bnad_reinit_rx(bnad);
		bnad_reinit_rx(bnad);
		}

		/* rx_count > 0 - new rx created
		* - Linux set err = 0 and return
		*/
		err = bnad_mtu_set(bnad, new_frame);
		if (err)
		err = -EBUSY;

drivers/net/ethernet/dec/tulip/de4x5.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -4927,11 +4927,11 @@ mii_get_oui(u_char phyaddr, u_long ioaddr)
		u_char breg[2];
		} a;
		int i, r2, r3, ret=0;*/
		int r2, r3;
		int r2;

		/* Read r2 and r3 */
		r2 = mii_rd(MII_ID0, phyaddr, ioaddr);
		r3 = mii_rd(MII_ID1, phyaddr, ioaddr);
		mii_rd(MII_ID1, phyaddr, ioaddr);
		/* SEEQ and Cypress way * /
		/ * Shuffle r2 and r3 * /
		a.reg=0;

drivers/net/ethernet/dec/tulip/media.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -319,13 +319,8 @@ void tulip_select_media(struct net_device *dev, int startup)
		break;
		}
		case 5: case 6: {
		u16 setup[5];

		new_csr6 = 0; /* FIXME */

		for (i = 0; i < 5; i++)
		setup[i] = get_u16(&p[i*2 + 1]);

		if (startup && mtable->has_reset) {
		struct medialeaf *rleaf = &mtable->mleaf[mtable->has_reset];
		unsigned char *rst = rleaf->leafdata;

drivers/net/ethernet/mellanox/mlx4/en_tx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -862,6 +862,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff skb, struct net_device dev)
		struct mlx4_en_tx_desc *tx_desc;
		struct mlx4_wqe_data_seg *data;
		struct mlx4_en_tx_info *tx_info;
		u32 __maybe_unused ring_cons;
		int tx_ind;
		int nr_txbb;
		int desc_size;
		@@ -875,7 +876,6 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff skb, struct net_device dev)
		bool stop_queue;
		bool inline_ok;
		u8 data_offset;
		u32 ring_cons;
		bool bf_ok;

		tx_ind = skb_get_queue_mapping(skb);

drivers/net/ethernet/micrel/ksz884x.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1657,8 +1657,7 @@ static inline void set_tx_len(struct ksz_desc *desc, u32 len)

		#define HW_DELAY(hw, reg) \
		do { \
		u16 dummy; \
		dummy = readw(hw->io + reg); \
		readw(hw->io + reg); \
		} while (0)

		/**