From patchwork Sun Feb 10 15:38:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 219497 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2C0CD2C0094 for ; Mon, 11 Feb 2013 02:45:27 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755867Ab3BJPpI (ORCPT ); Sun, 10 Feb 2013 10:45:08 -0500 Received: from ducie-dc1.codethink.co.uk ([37.128.190.40]:59933 "EHLO ducie-dc1.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755581Ab3BJPpG (ORCPT ); Sun, 10 Feb 2013 10:45:06 -0500 Received: by ducie-dc1.codethink.co.uk (Postfix, from userid 1002) id 4CAFD46C68E; Sun, 10 Feb 2013 15:38:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ducie-dc1.codethink.co.uk X-Spam-Level: X-Spam-Status: No, score=-2.9 required=6.0 tests=ALL_TRUSTED,BAYES_00 autolearn=unavailable version=3.3.2 Received: from rainbowdash.ducie.codethink.co.uk (rainbowdash.dyn.ducie.codethink.co.uk [192.168.24.216]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPS id D5685463A13; Sun, 10 Feb 2013 15:38:43 +0000 (GMT) Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.80) (envelope-from ) id 1U4YzL-0004eh-IY; Sun, 10 Feb 2013 15:38:43 +0000 From: Ben Dooks To: netdev@vger.kernel.org Cc: "David S. Miller" , Rob Herring , linux-arm-kernel@lists.infradead.org, Ben Dooks Subject: [PATCH 1/2] net: calexdaxgmac: fix printing of hardware version Date: Sun, 10 Feb 2013 15:38:40 +0000 Message-Id: <1360510721-17860-2-git-send-email-ben.dooks@codethink.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360510721-17860-1-git-send-email-ben.dooks@codethink.co.uk> References: <1360510721-17860-1-git-send-email-ben.dooks@codethink.co.uk> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The current driver attempts to print netdev_info() before registering the network device and allowing the name to be set. Change this print to be after the network deviec has been registered, and thus has been allocated a network device name. Fix the following issue: calxedaxgmac fff50000.ethernet (unregistered net_device): h/w version is 0x1012 Signed-off-by: Ben Dooks Acked-by: Rob Herring --- drivers/net/ethernet/calxeda/xgmac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c index f7f0290..f91d9b2 100644 --- a/drivers/net/ethernet/calxeda/xgmac.c +++ b/drivers/net/ethernet/calxeda/xgmac.c @@ -1715,9 +1715,6 @@ static int xgmac_probe(struct platform_device *pdev) goto err_io; } - uid = readl(priv->base + XGMAC_VERSION); - netdev_info(ndev, "h/w version is 0x%x\n", uid); - writel(0, priv->base + XGMAC_DMA_INTR_ENA); ndev->irq = platform_get_irq(pdev, 0); if (ndev->irq == -ENXIO) { @@ -1771,6 +1768,9 @@ static int xgmac_probe(struct platform_device *pdev) if (ret) goto err_reg; + uid = readl(priv->base + XGMAC_VERSION); + netdev_info(ndev, "h/w version is 0x%x\n", uid); + return 0; err_reg: