Commit 6165feda authored by Simon Horman's avatar Simon Horman Committed by Jakub Kicinski
Browse files

net: tulip: avoid unused variable warning 



There is an effort to achieve W=1 kernel builds without warnings.
As part of that effort Helge Deller highlighted the following warnings
in the tulip driver when compiling with W=1 and CONFIG_TULIP_MWI=n:

  .../tulip_core.c: In function ‘tulip_init_one’:
  .../tulip_core.c:1309:22: warning: variable ‘force_csr0’ set but not used

This patch addresses that problem using IS_ENABLED(). This approach has
the added benefit of reducing conditionally compiled code. And thus
increasing compile coverage. E.g. for allmodconfig builds which enable
CONFIG_TULIP_MWI.

Compile tested only.
No run-time effect intended.

Acked-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250318-tulip-w1-v3-1-a813fadd164d@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5555b34c

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

+2 −5
Original line number Diff line number Diff line
@@ -1177,7 +1177,6 @@ static void set_rx_mode(struct net_device *dev) 
	iowrite32(csr6, ioaddr + CSR6);

}



#ifdef CONFIG_TULIP_MWI

static void tulip_mwi_config(struct pci_dev *pdev, struct net_device *dev)

{

	struct tulip_private *tp = netdev_priv(dev);
@@ -1251,7 +1250,6 @@ static void tulip_mwi_config(struct pci_dev *pdev, struct net_device *dev) 
		netdev_dbg(dev, "MWI config cacheline=%d, csr0=%08x\n",

			   cache, csr0);

}

#endif



/*

 *	Chips that have the MRM/reserved bit quirk and the burst quirk. That
@@ -1463,10 +1461,9 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


	INIT_WORK(&tp->media_work, tulip_tbl[tp->chip_id].media_task);



#ifdef CONFIG_TULIP_MWI

	if (!force_csr0 && (tp->flags & HAS_PCI_MWI))

	if (IS_ENABLED(CONFIG_TULIP_MWI) && !force_csr0 &&

	    (tp->flags & HAS_PCI_MWI))

		tulip_mwi_config (pdev, dev);

#endif



	/* Stop the chip's Tx and Rx processes. */

	tulip_stop_rxtx(tp);