Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de927188 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

net: tulip: turn compile-time warning into dev_warn() 



The tulip driver causes annoying build-time warnings for allmodconfig
builds for all recent architectures:

dec/tulip/winbond-840.c:910:2: warning: #warning Processor architecture undefined
dec/tulip/tulip_core.c:101:2: warning: #warning Processor architecture undefined!

This is the last remaining warning for arm64, and I'd like to get rid of
it. We don't really know the cache line size, architecturally it would
be at least 16 bytes, but all implementations I found have 64 or 128
bytes. Configuring tulip for 32-byte lines as we do on ARM32 seems to
be the safe but slow default, and nobody who cares about performance these
days would use a tulip chip anyway, so we can just use that.

To save the next person the job of trying to find out what this is for
and picking a default for their architecture just to kill off the warning,
I'm now removing the preprocessor #warning and turning it into a pr_warn
or dev_warn that prints the equivalent information when the driver gets
loaded.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarGrant Grundler <grundler@parisc-linux.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 425d3d83

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

+7 −2
Original line number Original line Diff line number Diff line
@@ -98,8 +98,7 @@ static int csr0 = 0x01A00000 | 0x4800; 
#elif defined(__mips__)

#elif defined(__mips__)

static int csr0 = 0x00200000 | 0x4000;

static int csr0 = 0x00200000 | 0x4000;

#else

#else

#warning Processor architecture undefined!

static int csr0;

static int csr0 = 0x00A00000 | 0x4800;

#endif

#endif





/* Operational parameters that usually are not changed. */

/* Operational parameters that usually are not changed. */
@@ -1982,6 +1981,12 @@ static int __init tulip_init (void) 
	pr_info("%s", version);

	pr_info("%s", version);

#endif

#endif





	if (!csr0) {

		pr_warn("tulip: unknown CPU architecture, using default csr0\n");

		/* default to 8 longword cache line alignment */

		csr0 = 0x00A00000 | 0x4800;

	}



	/* copy module parms into globals */

	/* copy module parms into globals */

	tulip_rx_copybreak = rx_copybreak;

	tulip_rx_copybreak = rx_copybreak;

	tulip_max_interrupt_work = max_interrupt_work;

	tulip_max_interrupt_work = max_interrupt_work;

drivers/net/ethernet/dec/tulip/winbond-840.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -907,7 +907,7 @@ static void init_registers(struct net_device *dev) 
#elif defined(CONFIG_SPARC) || defined (CONFIG_PARISC) || defined(CONFIG_ARM)

#elif defined(CONFIG_SPARC) || defined (CONFIG_PARISC) || defined(CONFIG_ARM)

	i |= 0x4800;

	i |= 0x4800;

#else

#else

#warning Processor architecture undefined

	dev_warn(&dev->dev, "unknown CPU architecture, using default csr0 setting\n");

	i |= 0x4800;

	i |= 0x4800;

#endif

#endif

	iowrite32(i, ioaddr + PCIBusCfg);

	iowrite32(i, ioaddr + PCIBusCfg);