From patchwork Tue Mar 23 13:46:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Bj=C3=B8rn_Mork?= X-Patchwork-Id: 87630 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2NDkTOW003723 for ; Tue, 23 Mar 2010 13:46:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753406Ab0CWNq2 (ORCPT ); Tue, 23 Mar 2010 09:46:28 -0400 Received: from canardo.mork.no ([148.122.252.1]:50156 "EHLO canardo.mork.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753397Ab0CWNq2 (ORCPT ); Tue, 23 Mar 2010 09:46:28 -0400 Received: from canardo.mork.no (ip6-localhost [IPv6:::1]) by canardo.mork.no (8.14.3/8.14.3) with ESMTP id o2NDkLFW012325 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 23 Mar 2010 14:46:21 +0100 Received: (from bjorn@localhost) by canardo.mork.no (8.14.3/8.14.3/Submit) id o2NDkLBB012324; Tue, 23 Mar 2010 14:46:21 +0100 From: =?utf-8?q?Bj=C3=B8rn=20Mork?= To: linux-media@vger.kernel.org Cc: =?utf-8?q?Bj=C3=B8rn=20Mork?= Subject: [PATCH] V4L/DVB: saa7146: Making IRQF_DISABLED or IRQF_SHARED optional Date: Tue, 23 Mar 2010 14:46:21 +0100 Message-Id: <1269351981-12292-1-git-send-email-bjorn@mork.no> X-Mailer: git-send-email 1.5.6.5 MIME-Version: 1.0 References: <1269202135-340-1-git-send-email-bjorn@mork.no> <1269206641.6135.68.camel@palomino.walls.org> <87ocigwvrf.fsf@nemi.mork.no> In-Reply-To: <87ocigwvrf.fsf@nemi.mork.no> X-Spam-Status: No, score=0.6 required=5.0 tests=AWL,BAYES_00, DATE_IN_FUTURE_48_96,NO_RELAYS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on canardo.mork.no X-Virus-Scanned: clamav-milter 0.95.3 at canardo X-Virus-Status: Clean Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 23 Mar 2010 13:46:29 +0000 (UTC) diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c index 982f000..21127f6 100644 --- a/drivers/media/common/saa7146_core.c +++ b/drivers/media/common/saa7146_core.c @@ -26,9 +26,13 @@ DEFINE_MUTEX(saa7146_devices_lock); static int saa7146_num; unsigned int saa7146_debug; +static int irqflags = IRQF_SHARED | IRQF_DISABLED; module_param(saa7146_debug, uint, 0644); MODULE_PARM_DESC(saa7146_debug, "debug level (default: 0)"); +module_param(irqflags, int, 0444); +MODULE_PARM_DESC(irqflags, "request_irq flags - default: 0xA0 = 0x20 (IRQF_DISABLED) | 0x80 (IRQF_SHARED)"); + #if 0 static void dump_registers(struct saa7146_dev* dev) @@ -416,7 +420,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent saa7146_write(dev, MC2, 0xf8000000); /* request an interrupt for the saa7146 */ - err = request_irq(pci->irq, interrupt_hw, IRQF_SHARED | IRQF_DISABLED, + err = request_irq(pci->irq, interrupt_hw, irqflags, dev->name, dev); if (err < 0) { ERR(("request_irq() failed.\n"));