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

Commit 66e19689 authored by Finn Thain's avatar Finn Thain Committed by David S. Miller
Browse files

net/macmace: Fix and clean up log messages 



Don't log the unexpanded "eth%d" format string.
Log the chip revision in the probe message (consistent with mace.c).
Drop redundant debug messages for FIFO events recorded in the
interface statistics (also consistent with mace.c).

Tested-by: default avatarStan Johnson <userm57@yahoo.com>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82695b30

drivers/net/ethernet/apple/macmace.c

+3 −6
Original line number Diff line number Diff line
@@ -247,8 +247,8 @@ static int mace_probe(struct platform_device *pdev) 
	dev->netdev_ops		= &mace_netdev_ops;

	dev->watchdog_timeo	= TX_TIMEOUT;



	printk(KERN_INFO "%s: 68K MACE, hardware address %pM\n",

	       dev->name, dev->dev_addr);

	pr_info("Onboard MACE, hardware address %pM, chip revision 0x%04X\n",

		dev->dev_addr, mp->chipid);



	err = register_netdev(dev);

	if (!err)
@@ -589,7 +589,6 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id) 
			else if (fs & (UFLO|LCOL|RTRY)) {

				++dev->stats.tx_aborted_errors;

				if (mb->xmtfs & UFLO) {

					printk(KERN_ERR "%s: DMA underrun.\n", dev->name);

					dev->stats.tx_fifo_errors++;

					mace_txdma_reset(dev);

				}
@@ -644,10 +643,8 @@ static void mace_dma_rx_frame(struct net_device *dev, struct mace_frame *mf) 


	if (frame_status & (RS_OFLO | RS_CLSN | RS_FRAMERR | RS_FCSERR)) {

		dev->stats.rx_errors++;

		if (frame_status & RS_OFLO) {

			printk(KERN_DEBUG "%s: fifo overflow.\n", dev->name);

		if (frame_status & RS_OFLO)

			dev->stats.rx_fifo_errors++;

		}

		if (frame_status & RS_CLSN)

			dev->stats.collisions++;

		if (frame_status & RS_FRAMERR)