From patchwork Tue May 27 04:49:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 352680 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 E642A14007F for ; Tue, 27 May 2014 15:27:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752334AbaE0F1S (ORCPT ); Tue, 27 May 2014 01:27:18 -0400 Received: from mirror2.csie.ntu.edu.tw ([140.112.30.76]:39935 "EHLO mirror2.csie.ntu.edu.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751854AbaE0F1R (ORCPT ); Tue, 27 May 2014 01:27:17 -0400 X-Greylist: delayed 2219 seconds by postgrey-1.27 at vger.kernel.org; Tue, 27 May 2014 01:27:17 EDT Received: from wens by mirror2.csie.ntu.edu.tw with local (Exim 4.82) (envelope-from ) id 1Wp9Kt-0004yQ-00; Tue, 27 May 2014 12:50:02 +0800 From: Chen-Yu Tsai To: "David S. Miller" , Giuseppe Cavallaro Cc: Chen-Yu Tsai , netdev@vger.kernel.org, Grygorii Strashko , Russell King , Rob Herring , Maxime Ripard Subject: [PATCH net-next] net: stmmac: Handle different error codes from platform_get_irq_byname Date: Tue, 27 May 2014 12:49:54 +0800 Message-Id: <1401166194-19085-1-git-send-email-wens@csie.org> X-Mailer: git-send-email 2.0.0.rc2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The following patch moved device tree interrupt resolution into platform_get_irq_byname: ad69674 of/irq: do irq resolution in platform_get_irq_byname() As a result, the function no longer only return -ENXIO on error. This breaks DT based probing of stmmac, as seen in test runs of linux-next next-20140526 cubie2-sunxi_defconfig: http://lists.linaro.org/pipermail/kernel-build-reports/2014-May/003659.html This patch makes the stmmac_platform probe function properly handle error codes, such as returning for deferred probing, and other codes returned by of_irq_get_by_name. Signed-off-by: Chen-Yu Tsai --- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 46aef510..9562b18 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -237,10 +237,12 @@ static int stmmac_pltfr_probe(struct platform_device *pdev) /* Get the MAC information */ priv->dev->irq = platform_get_irq_byname(pdev, "macirq"); - if (priv->dev->irq == -ENXIO) { - pr_err("%s: ERROR: MAC IRQ configuration " - "information not found\n", __func__); - return -ENXIO; + if (priv->dev->irq < 0) { + if (priv->wol_irq != -EPROBE_DEFER) { + pr_err("%s: ERROR: MAC IRQ configuration " + "information not found\n", __func__); + } + return priv->dev->irq; } /* @@ -252,10 +254,18 @@ static int stmmac_pltfr_probe(struct platform_device *pdev) * so the driver will continue to use the mac irq (ndev->irq) */ priv->wol_irq = platform_get_irq_byname(pdev, "eth_wake_irq"); - if (priv->wol_irq == -ENXIO) + if (priv->wol_irq < 0) { + if (priv->wol_irq == -EPROBE_DEFER) + return -EPROBE_DEFER; priv->wol_irq = priv->dev->irq; + } priv->lpi_irq = platform_get_irq_byname(pdev, "eth_lpi"); + if (priv->lpi_irq < 0) { + if (priv->wol_irq == -EPROBE_DEFER) + return -EPROBE_DEFER; + priv->lpi_irq = -ENXIO; + } platform_set_drvdata(pdev, priv->dev);