From patchwork Wed Jan 14 05:21:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Stanley.Miao" X-Patchwork-Id: 18352 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 0C669474C3 for ; Wed, 14 Jan 2009 16:13:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753053AbZANFNe (ORCPT ); Wed, 14 Jan 2009 00:13:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752948AbZANFNd (ORCPT ); Wed, 14 Jan 2009 00:13:33 -0500 Received: from mail.windriver.com ([147.11.1.11]:47420 "EHLO mail.wrs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752894AbZANFNd (ORCPT ); Wed, 14 Jan 2009 00:13:33 -0500 Received: from ALA-MAIL03.corp.ad.wrs.com (ala-mail03 [147.11.57.144]) by mail.wrs.com (8.13.6/8.13.6) with ESMTP id n0E5DCrm003518; Tue, 13 Jan 2009 21:13:12 -0800 (PST) Received: from ala-mail06.corp.ad.wrs.com ([147.11.57.147]) by ALA-MAIL03.corp.ad.wrs.com with Microsoft SMTPSVC(6.0.3790.1830); Tue, 13 Jan 2009 21:13:12 -0800 Received: from localhost.localdomain ([128.224.162.224]) by ala-mail06.corp.ad.wrs.com with Microsoft SMTPSVC(6.0.3790.1830); Tue, 13 Jan 2009 21:13:11 -0800 From: "Stanley.Miao" To: netdev@vger.kernel.org Cc: steve.glendinning@smsc.com, linux-arm-kernel@lists.arm.linux.org.uk Subject: [PATCH] smsc911x: add irq_flags in smsc911x_platform_config. Date: Wed, 14 Jan 2009 13:21:52 +0800 Message-Id: <1231910512-8420-1-git-send-email-stanley.miao@windriver.com> X-Mailer: git-send-email 1.5.6.3 X-OriginalArrivalTime: 14 Jan 2009 05:13:11.0421 (UTC) FILETIME=[CB954AD0:01C97606] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When calling request IRQ it is desirable to allow platforms to specific flags for the call to request_irq. Adding irq_flags to smsc911x_platform_config allows these flags to be passed. Signed-off-by: Stanley.Miao --- drivers/net/smsc911x.c | 6 ++++-- include/linux/smsc911x.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index f513bdf..1092517 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c @@ -1896,6 +1896,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) unsigned int intcfg = 0; int res_size; int retval; + irq_flags; DECLARE_MAC_BUF(mac); pr_info("%s: Driver version %s.\n", SMSC_CHIPNAME, SMSC_DRV_VERSION); @@ -1968,8 +1969,9 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) smsc911x_reg_write(pdata, INT_EN, 0); smsc911x_reg_write(pdata, INT_STS, 0xFFFFFFFF); - retval = request_irq(dev->irq, smsc911x_irqhandler, IRQF_DISABLED, - dev->name, dev); + irq_flags = IRQF_DISABLED | pdata->config.irq_flags; + retval = request_irq(dev->irq, smsc911x_irqhandler, irq_flags, + dev->name, dev); if (retval) { SMSC_WARNING(PROBE, "Unable to claim requested irq: %d", dev->irq); diff --git a/include/linux/smsc911x.h b/include/linux/smsc911x.h index 1cbf031..0330f57 100644 --- a/include/linux/smsc911x.h +++ b/include/linux/smsc911x.h @@ -28,6 +28,7 @@ struct smsc911x_platform_config { unsigned int irq_polarity; unsigned int irq_type; + unsigned int irq_flags; unsigned int flags; phy_interface_t phy_interface; };