mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Michal Simek <monstr@monstr.eu>
To: linux-kernel@vger.kernel.org
Cc: netdev@vger.kernel.org, devicetree-discuss@lists.ozlabs.org,
	Michal Simek <monstr@monstr.eu>,
	"David S. Miller" <davem@davemloft.net> (commit_signer:7/10=70%),
	Stephen Rothwell <sfr@canb.auug.org.au> (commit_signer:1/10=10%),
	Grant Likely <grant.likely@secretlab.ca>,
	Ryan Mallon <rmallon@gmail.com>
Subject: [PATCH 2/4] net: ethernet: xilinx: Don't use NO_IRQ in xilinx
Date: Wed, 21 Dec 2011 15:32:10 +0100	[thread overview]
Message-ID: <1324477932-19262-2-git-send-email-monstr@monstr.eu> (raw)
In-Reply-To: <1324477932-19262-1-git-send-email-monstr@monstr.eu>

Fix ll_temac and emaclite drivers. Only Microblaze and Xilinx PPC
use then and both use NO_IRQ as 0. It will be removed in near future.

Signed-off-by: Michal Simek <monstr@monstr.eu>
CC: "David S. Miller" <davem@davemloft.net> (commit_signer:7/10=70%)
CC: Stephen Rothwell <sfr@canb.auug.org.au> (commit_signer:1/10=10%)
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Ryan Mallon <rmallon@gmail.com>
---
 drivers/net/ethernet/xilinx/ll_temac_main.c   |    2 +-
 drivers/net/ethernet/xilinx/xilinx_emaclite.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 2681b53..87775d7 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -1077,7 +1077,7 @@ static int __devinit temac_of_probe(struct platform_device *op)
 
 	of_node_put(np); /* Finished with the DMA node; drop the reference */
 
-	if ((lp->rx_irq == NO_IRQ) || (lp->tx_irq == NO_IRQ)) {
+	if (!lp->rx_irq || !lp->tx_irq) {
 		dev_err(&op->dev, "could not determine irqs\n");
 		rc = -ENOMEM;
 		goto err_iounmap_2;
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 8018d7d..252edf7 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -1129,7 +1129,7 @@ static int __devinit xemaclite_of_probe(struct platform_device *ofdev)
 
 	/* Get IRQ for the device */
 	rc = of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq);
-	if (rc == NO_IRQ) {
+	if (!rc) {
 		dev_err(dev, "no IRQ found\n");
 		return rc;
 	}
-- 
1.7.5.4


  reply	other threads:[~2011-12-21 14:32 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-21 14:32 [PATCH 1/4] block: xsysace: Don't use NO_IRQ Michal Simek
2011-12-21 14:32 ` Michal Simek [this message]
2011-12-21 14:32   ` [PATCH 3/4] input: xilinx_ps2: " Michal Simek
2011-12-21 14:32     ` [PATCH 4/4] microblaze: Remove NO_IRQ from architecture Michal Simek
2011-12-21 22:09       ` Ryan Mallon
2011-12-22  8:06         ` Michal Simek
2012-01-02  8:22       ` Grant Likely
2012-01-02  8:21     ` [PATCH 3/4] input: xilinx_ps2: Don't use NO_IRQ Grant Likely
2011-12-21 20:43   ` [PATCH 2/4] net: ethernet: xilinx: Don't use NO_IRQ in xilinx David Miller
2012-01-02  8:21   ` Grant Likely
2011-12-29  9:27 ` [PATCH 1/4] block: xsysace: Don't use NO_IRQ Michal Simek
2012-01-02  8:21 ` Grant Likely

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1324477932-19262-2-git-send-email-monstr@monstr.eu \
    --to=monstr@monstr.eu \
    --cc=davem@davemloft.net \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=grant.likely@secretlab.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=rmallon@gmail.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®