From patchwork Sun Nov 1 22:51:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 37392 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 3B0E7B7C19 for ; Mon, 2 Nov 2009 09:51:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753824AbZKAWvF (ORCPT ); Sun, 1 Nov 2009 17:51:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753786AbZKAWvE (ORCPT ); Sun, 1 Nov 2009 17:51:04 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:50399 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753656AbZKAWvD (ORCPT ); Sun, 1 Nov 2009 17:51:03 -0500 Received: from deadeye.i.decadent.org.uk ([192.168.4.185] helo=localhost) by shadbolt.decadent.org.uk with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1N4jGL-0004MB-81; Sun, 01 Nov 2009 22:51:05 +0000 Received: from womble by localhost with local (Exim 4.69) (envelope-from ) id 1N4jGK-00083y-8E; Sun, 01 Nov 2009 22:51:04 +0000 From: Ben Hutchings To: Francois Romieu , Edward Hsu Cc: "David S. Miller" , netdev In-Reply-To: <1257115687.3136.337.camel@localhost> References: <1257115687.3136.337.camel@localhost> Date: Sun, 01 Nov 2009 22:51:04 +0000 Message-Id: <1257115864.3136.338.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.28.0 X-SA-Exim-Connect-IP: 192.168.4.185 X-SA-Exim-Mail-From: ben@decadent.org.uk X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on shadbolt.decadent.org.uk X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED autolearn=disabled version=3.2.5 Subject: [PATCH 1/2] r8169: allow rtl_hw_phy_config() and rtl8169_init_phy() to return error codes X-SA-Exim-Version: 4.2.1 (built Wed, 25 Jun 2008 17:14:11 +0000) X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is preparation for loading PHY firmware, which may fail. Signed-off-by: Ben Hutchings --- This one belongs before the other. Sorry about sending them in the wrong order. Ben. drivers/net/r8169.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index f98ef52..8ceecd0 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -2607,7 +2607,7 @@ static void rtl8102e_hw_phy_config(void __iomem *ioaddr) rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init)); } -static void rtl_hw_phy_config(struct net_device *dev) +static int rtl_hw_phy_config(struct net_device *dev) { struct rtl8169_private *tp = netdev_priv(dev); void __iomem *ioaddr = tp->mmio_addr; @@ -2676,6 +2676,8 @@ static void rtl_hw_phy_config(struct net_device *dev) default: break; } + + return 0; } static void rtl8169_phy_timer(unsigned long __opaque) @@ -2780,11 +2782,14 @@ static void rtl8169_phy_reset(struct net_device *dev, printk(KERN_ERR "%s: PHY reset failed.\n", dev->name); } -static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp) +static int rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp) { void __iomem *ioaddr = tp->mmio_addr; + int rc; - rtl_hw_phy_config(dev); + rc = rtl_hw_phy_config(dev); + if (rc) + return rc; if (tp->mac_version <= RTL_GIGA_MAC_VER_06) { dprintk("Set MAC Reg C+CR Offset 0x82h = 0x01h\n"); @@ -2813,6 +2818,8 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp) if ((RTL_R8(PHYstatus) & TBI_Enable) && netif_msg_link(tp)) printk(KERN_INFO PFX "%s: TBI auto-negotiating\n", dev->name); + + return 0; } static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr) @@ -3199,7 +3206,9 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->dev_addr[4], dev->dev_addr[5], xid, dev->irq); } - rtl8169_init_phy(dev, tp); + rc = rtl8169_init_phy(dev, tp); + if (rc) + goto err_out_msi_5; /* * Pretend we are using VLANs; This bypasses a nasty bug where