From patchwork Fri Oct 6 01:11:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Finn Thain X-Patchwork-Id: 822139 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y7Wpl1wkmz9t2h for ; Fri, 6 Oct 2017 12:13:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751797AbdJFBMe (ORCPT ); Thu, 5 Oct 2017 21:12:34 -0400 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:44096 "EHLO kvm5.telegraphics.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751446AbdJFBLH (ORCPT ); Thu, 5 Oct 2017 21:11:07 -0400 Received: by kvm5.telegraphics.com.au (Postfix, from userid 502) id 5E3E42A1B9; Thu, 5 Oct 2017 21:11:05 -0400 (EDT) To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Message-Id: In-Reply-To: References: From: Finn Thain Subject: [PATCH net v2 5/9] net/macmace: Fix and cleanup log messages Date: Thu, 5 Oct 2017 21:11:05 -0400 (EDT) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Log the MAC address after the interface gets a meaningful name and in doing so, make the registration error path more idiomatic. Drop redundant debug messages for FIFO events recorded in the interface statistics (consistent with mace.c). Signed-off-by: Finn Thain Tested-by: Stan Johnson --- drivers/net/ethernet/apple/macmace.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c index f17a160dbff2..54c1f1c2f54a 100644 --- a/drivers/net/ethernet/apple/macmace.c +++ b/drivers/net/ethernet/apple/macmace.c @@ -247,13 +247,14 @@ 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); - err = register_netdev(dev); - if (!err) - return 0; + if (err) + goto out_free; + + netdev_info(dev, "MAC %pM, IRQ %d\n", dev->dev_addr, dev->irq); + return 0; +out_free: free_netdev(dev); return err; } @@ -589,7 +590,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 +644,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)