From patchwork Sat Nov 2 13:41:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1188367 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="Zluhl/HQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4750d53ck7z9sPJ for ; Sun, 3 Nov 2019 00:43:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726823AbfKBNmX (ORCPT ); Sat, 2 Nov 2019 09:42:23 -0400 Received: from mout.gmx.net ([212.227.17.20]:48529 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726329AbfKBNmW (ORCPT ); Sat, 2 Nov 2019 09:42:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1572702114; bh=Gt8mtaRoWgef35XMJ2bznCxioijqTL1JeO9yIP8m0jk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Zluhl/HQN/QJi8FpCGnsv3PiWab2FfFsaZFJYue2XZUDutAZF0s9dPtXFWBY8anxo cEo/GLhNmvRcqmFof0fI7tnotkXNjyd2q+8ajBh4oXjKP/IMu2ZxkLUKgM4mtNjLsZ bSIx3yJLWT0FF0rX+OhjTxlveNJLjkoPHdJ3zZxg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.112]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MIdeX-1iCMvk3Ent-00EbY9; Sat, 02 Nov 2019 14:41:53 +0100 From: Stefan Wahren To: Matthias Brugger , Matthias Brugger , "David S . Miller" , Florian Fainelli Cc: Eric Anholt , Nicolas Saenz Julienne , Doug Berger , netdev@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, Stefan Wahren Subject: [PATCH RFC V2 1/6] net: bcmgenet: Fix error handling on IRQ retrieval Date: Sat, 2 Nov 2019 14:41:28 +0100 Message-Id: <1572702093-18261-2-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1572702093-18261-1-git-send-email-wahrenst@gmx.net> References: <1572702093-18261-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:4KOkdHKpqwUQBL+sP9jFmD/wRZEjL6GMtTHhcX3nDLnL4Y5dcZd U7Um4XjIfonOnK7J34g2rQh/EK1hD2iUFPp4PQS+ct8tqMFN7vA1M2Ht346gAXF15OSP0LR 0li69YNIZaGqrhekDHg7VnT+xA5LBqhh0yShLZ1WdGXn3MULzo4O8eGXoZPF13X3V/QBuxr 6nmBp24Wg/3ZBMYm7zu6Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:jUH8TvmwCkk=:rYJhhWDaD6/v9EYrP+WEkI 2wQhuOuc+u5FT6fyBXrx5yVKOLVsTmFiTWK7rzFsnwcGJzo5Y4b5zuO55AmBM8V9nKBuyymdr oYPPPMegpVyEp7zcaz9fvPQIDMsw1a5a5TFHbiBTC1NVsEDoAifGJuIEjAitygwcGJJt1cFgE MGad+QfmPfl2OvdFtfI4+GmYUdUQNlEIEf6dzDybIqPVKEhpGacOqRq/PWgUq8ATbHrOvjbaw Wb5djpkbh/ui9Rb+T5Q4Ai2PMq38da0ZDrnyDiSpHTEXtXc+7Fn+Suct9XBsNTTXpTQ6M7cgl 3+111cwcgAXJEiY5aRAWGhPJiFgUdHV1o6ozMBTN235fVZZ0Nh5AjJtpmTu8DOc45bgA8NLRy DDv92somX1T+n2PSgO12FR1areNNYVIMydXsa7BTnbL6ToZQZTiatVcK9CIWGu0BTi/FdK4Lr rkmgpBzeCV4bOJP1QzKyvoIiSXH8k/fGVtM8lfeSU3rHfeXfHbZVBzMcQGmuhPYvXYUlQOnho JZgT+OHImyjzpJJ8VA4kYpw1aK/mZ17gxbI9mEjS7bR5VkpeIW2WJ/5veewfo77G1DL3QMnD6 j8by582hlVXwPBrQfphM3ZkJxdv99ETr7GcLhPFPq+1GONr+d6rnMrgmEA62s4U4jg41ZDrZA Q/v4XuOzIX5Yu6suSuplYg0gOY3XvOaI5FYAMYWS8rpAMOCohEL2G5aUW6Zt5a8CJBkkeL8e3 3TC0280zjKIf5X61elDCe4l1zd5CnEf4lRdCv5Ym+oa/SEqmqEODw3MkBj0nExvHG3ST8f8rc 7TJsAw3lnTPFAjVxZJBt5F5ejF00T5PwPDdFvFlLeiPcwG7GJmg/SzCnVjESlXHmroFcAoqnV anU6JGxqvLBICJ4xpAMSjcjkSVF0pdKxsj0UqLvXTseQ+q8jBEDw/OLJN7aJhQvvkZ61//AY0 F+hEW2wjWTB4zrejq+zF0PvuN3pg413NCtUKX80CMaC5IL8BhutDzzh32/S96sNHAPiiuCMyg 5FrucD0SWpksEI2yggz5ORYIOY2UpCNX0sE9UasftU7ay88FB4j+TFpIdOmui29YDj0N/YjNm JMEllR6rYUivjsP1lJTOMxlanwMDY+J5bxMMPLVsc58DgHvrOs1Brggx3S80ywWP+brHs68EI 1cbMRZSB6ugrKAlifwY9m/EGtI3tFnn1GCBjVeshTsfpz5mZTtkFpl2huZxywOTzZ8DtqnHpx x4JVjrhUcbLDCf9kWDTBxov+AmwMytHWpJoTE5Q== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This fixes the error handling for the mandatory IRQs. There is no need for the error message anymore, this is now handled by platform_get_irq. Fixes: 1c1008c793fa ("net: bcmgenet: add main driver file") Signed-off-by: Stefan Wahren --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 4f689fb..105b3be 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -3464,13 +3464,16 @@ static int bcmgenet_probe(struct platform_device *pdev) priv = netdev_priv(dev); priv->irq0 = platform_get_irq(pdev, 0); + if (priv->irq0 < 0) { + err = priv->irq0; + goto err; + } priv->irq1 = platform_get_irq(pdev, 1); - priv->wol_irq = platform_get_irq(pdev, 2); - if (!priv->irq0 || !priv->irq1) { - dev_err(&pdev->dev, "can't find IRQs\n"); - err = -EINVAL; + if (priv->irq1 < 0) { + err = priv->irq1; goto err; } + priv->wol_irq = platform_get_irq(pdev, 2); if (dn) macaddr = of_get_mac_address(dn);