From patchwork Fri Dec 14 22:25:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Kleine-Budde X-Patchwork-Id: 206574 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 5A9FC2C0082 for ; Sat, 15 Dec 2012 09:25:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756586Ab2LNWZS (ORCPT ); Fri, 14 Dec 2012 17:25:18 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:53797 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755621Ab2LNWZQ (ORCPT ); Fri, 14 Dec 2012 17:25:16 -0500 Received: from gallifrey.ext.pengutronix.de ([2001:6f8:1178:4:5054:ff:fe8d:eefb] helo=hardanger.do.blackshift.org) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Tjdgv-0000O5-T3; Fri, 14 Dec 2012 23:25:13 +0100 From: Marc Kleine-Budde To: netdev@vger.kernel.org Cc: linux-can@vger.kernel.org, rdunlap@infradead.org, davem@davemloft.net, Marc Kleine-Budde , Andreas Larsson Subject: [PATCH v2] can: sja1000: fix compilation on x86 Date: Fri, 14 Dec 2012 23:25:12 +0100 Message-Id: <1355523912-1977-1-git-send-email-mkl@pengutronix.de> X-Mailer: git-send-email 1.7.10.4 X-SA-Exim-Connect-IP: 2001:6f8:1178:4:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since commit: 04df251 can: sja1000: Make sja1000_of_platform selectable and compilable on SPARC the driver can be activated on non powerpc platform like x86 or sparc. Without this patch the driver fails to compile on platform that don't define NO_IRQ, like x86. Reported-by: Randy Dunlap Cc: Andreas Larsson Signed-off-by: Marc Kleine-Budde --- Hello David, here's v2 of the patch. Changes since v1: * check if irq equals 0 (don't test for <= 0) regards, Marc --- The following changes since commit 17bc14b767cf0692420c43dbe5310ae98a5a7836: Revert "sched: Update_cfs_shares at period edge" (2012-12-14 07:20:43 -0800) are available in the git repository at: git://gitorious.org/linux-can/linux-can.git fixes-for-3.8 for you to fetch changes up to b9b325a81c77adc5d735b70a6fce6fb6d1317476: can: sja1000: fix compilation on x86 (2012-12-14 23:17:24 +0100) ---------------------------------------------------------------- Marc Kleine-Budde (1): can: sja1000: fix compilation on x86 drivers/net/can/sja1000/sja1000_of_platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c index 0f59170..6433b81 100644 --- a/drivers/net/can/sja1000/sja1000_of_platform.c +++ b/drivers/net/can/sja1000/sja1000_of_platform.c @@ -121,7 +121,7 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) } irq = irq_of_parse_and_map(np, 0); - if (irq == NO_IRQ) { + if (irq == 0) { dev_err(&ofdev->dev, "no irq found\n"); err = -ENODEV; goto exit_unmap_mem;