mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Andrew Morton <akpm@osdl.org>, Ingo Molnar <mingo@elte.hu>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	David Miller <davem@davemloft.net>
Subject: [RFC][patch 33/44] media: Use the new IRQF_ constansts
Date: Sat, 01 Jul 2006 14:54:58 -0000	[thread overview]
Message-ID: <20060701145227.065417000@cruncher.tec.linutronix.de> (raw)
In-Reply-To: <20060701145211.856500000@cruncher.tec.linutronix.de>

[-- Attachment #1: irqflags-drivers-media.patch --]
[-- Type: text/plain, Size: 10469 bytes --]


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
 drivers/media/common/saa7146_core.c        |    2 +-
 drivers/media/dvb/b2c2/flexcop-pci.c       |    2 +-
 drivers/media/dvb/bt8xx/bt878.c            |    2 +-
 drivers/media/dvb/pluto2/pluto2.c          |    2 +-
 drivers/media/video/bt8xx/bttv-driver.c    |    2 +-
 drivers/media/video/cx88/cx88-alsa.c       |    2 +-
 drivers/media/video/cx88/cx88-mpeg.c       |    2 +-
 drivers/media/video/cx88/cx88-video.c      |    2 +-
 drivers/media/video/meye.c                 |    2 +-
 drivers/media/video/saa7134/saa7134-alsa.c |    2 +-
 drivers/media/video/saa7134/saa7134-core.c |    2 +-
 drivers/media/video/saa7134/saa7134-oss.c  |    2 +-
 drivers/media/video/stradis.c              |    2 +-
 drivers/media/video/zoran_card.c           |    2 +-
 drivers/media/video/zr36120.c              |    2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

Index: linux-2.6.git/drivers/media/common/saa7146_core.c
===================================================================
--- linux-2.6.git.orig/drivers/media/common/saa7146_core.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/common/saa7146_core.c	2006-07-01 16:51:41.000000000 +0200
@@ -363,7 +363,7 @@ static int saa7146_init_one(struct pci_d
 	saa7146_write(dev, MC2, 0xf8000000);
 
 	/* request an interrupt for the saa7146 */
-	err = request_irq(pci->irq, interrupt_hw, SA_SHIRQ | SA_INTERRUPT,
+	err = request_irq(pci->irq, interrupt_hw, IRQF_SHARED | IRQF_DISABLED,
 			  dev->name, dev);
 	if (err < 0) {
 		ERR(("request_irq() failed.\n"));
Index: linux-2.6.git/drivers/media/dvb/b2c2/flexcop-pci.c
===================================================================
--- linux-2.6.git.orig/drivers/media/dvb/b2c2/flexcop-pci.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/dvb/b2c2/flexcop-pci.c	2006-07-01 16:51:41.000000000 +0200
@@ -294,7 +294,7 @@ static int flexcop_pci_init(struct flexc
 	pci_set_drvdata(fc_pci->pdev, fc_pci);
 
 	if ((ret = request_irq(fc_pci->pdev->irq, flexcop_pci_isr,
-					SA_SHIRQ, DRIVER_NAME, fc_pci)) != 0)
+					IRQF_SHARED, DRIVER_NAME, fc_pci)) != 0)
 		goto err_pci_iounmap;
 
 	spin_lock_init(&fc_pci->irq_lock);
Index: linux-2.6.git/drivers/media/dvb/bt8xx/bt878.c
===================================================================
--- linux-2.6.git.orig/drivers/media/dvb/bt8xx/bt878.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/dvb/bt8xx/bt878.c	2006-07-01 16:51:41.000000000 +0200
@@ -488,7 +488,7 @@ static int __devinit bt878_probe(struct 
 	btwrite(0, BT848_INT_MASK);
 
 	result = request_irq(bt->irq, bt878_irq,
-			     SA_SHIRQ | SA_INTERRUPT, "bt878",
+			     IRQF_SHARED | IRQF_DISABLED, "bt878",
 			     (void *) bt);
 	if (result == -EINVAL) {
 		printk(KERN_ERR "bt878(%d): Bad irq number or handler\n",
Index: linux-2.6.git/drivers/media/dvb/pluto2/pluto2.c
===================================================================
--- linux-2.6.git.orig/drivers/media/dvb/pluto2/pluto2.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/dvb/pluto2/pluto2.c	2006-07-01 16:51:41.000000000 +0200
@@ -616,7 +616,7 @@ static int __devinit pluto2_probe(struct
 
 	pci_set_drvdata(pdev, pluto);
 
-	ret = request_irq(pdev->irq, pluto_irq, SA_SHIRQ, DRIVER_NAME, pluto);
+	ret = request_irq(pdev->irq, pluto_irq, IRQF_SHARED, DRIVER_NAME, pluto);
 	if (ret < 0)
 		goto err_pci_iounmap;
 
Index: linux-2.6.git/drivers/media/video/meye.c
===================================================================
--- linux-2.6.git.orig/drivers/media/video/meye.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/video/meye.c	2006-07-01 16:51:41.000000000 +0200
@@ -1881,7 +1881,7 @@ static int __devinit meye_probe(struct p
 
 	meye.mchip_irq = pcidev->irq;
 	if (request_irq(meye.mchip_irq, meye_irq,
-			SA_INTERRUPT | SA_SHIRQ, "meye", meye_irq)) {
+			IRQF_DISABLED | IRQF_SHARED, "meye", meye_irq)) {
 		printk(KERN_ERR "meye: request_irq failed\n");
 		goto outreqirq;
 	}
Index: linux-2.6.git/drivers/media/video/stradis.c
===================================================================
--- linux-2.6.git.orig/drivers/media/video/stradis.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/video/stradis.c	2006-07-01 16:51:41.000000000 +0200
@@ -1983,7 +1983,7 @@ static int __devinit configure_saa7146(s
 	memcpy(&saa->video_dev, &saa_template, sizeof(saa_template));
 	saawrite(0, SAA7146_IER);	/* turn off all interrupts */
 
-	retval = request_irq(saa->irq, saa7146_irq, SA_SHIRQ | SA_INTERRUPT,
+	retval = request_irq(saa->irq, saa7146_irq, IRQF_SHARED | IRQF_DISABLED,
 		"stradis", saa);
 	if (retval == -EINVAL)
 		dev_err(&pdev->dev, "%d: Bad irq number or handler\n", num);
Index: linux-2.6.git/drivers/media/video/zoran_card.c
===================================================================
--- linux-2.6.git.orig/drivers/media/video/zoran_card.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/video/zoran_card.c	2006-07-01 16:51:41.000000000 +0200
@@ -1380,7 +1380,7 @@ find_zr36057 (void)
 
 		result = request_irq(zr->pci_dev->irq,
 				     zoran_irq,
-				     SA_SHIRQ | SA_INTERRUPT,
+				     IRQF_SHARED | IRQF_DISABLED,
 				     ZR_DEVNAME(zr),
 				     (void *) zr);
 		if (result < 0) {
Index: linux-2.6.git/drivers/media/video/zr36120.c
===================================================================
--- linux-2.6.git.orig/drivers/media/video/zr36120.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/video/zr36120.c	2006-07-01 16:51:41.000000000 +0200
@@ -1858,7 +1858,7 @@ int __init find_zoran(void)
 		DEBUG(printk(KERN_DEBUG "zoran: mapped-memory at 0x%p\n",ztv->zoran_mem));
 
 		result = request_irq(dev->irq, zoran_irq,
-			SA_SHIRQ|SA_INTERRUPT,"zoran", ztv);
+			IRQF_SHARED|IRQF_DISABLED,"zoran", ztv);
 		if (result==-EINVAL)
 		{
 			iounmap(ztv->zoran_mem);
Index: linux-2.6.git/drivers/media/video/bt8xx/bttv-driver.c
===================================================================
--- linux-2.6.git.orig/drivers/media/video/bt8xx/bttv-driver.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/video/bt8xx/bttv-driver.c	2006-07-01 16:51:41.000000000 +0200
@@ -4050,7 +4050,7 @@ static int __devinit bttv_probe(struct p
 	/* disable irqs, register irq handler */
 	btwrite(0, BT848_INT_MASK);
 	result = request_irq(btv->c.pci->irq, bttv_irq,
-			     SA_SHIRQ | SA_INTERRUPT,btv->c.name,(void *)btv);
+			     IRQF_SHARED | IRQF_DISABLED,btv->c.name,(void *)btv);
 	if (result < 0) {
 		printk(KERN_ERR "bttv%d: can't get IRQ %d\n",
 		       bttv_num,btv->c.pci->irq);
Index: linux-2.6.git/drivers/media/video/cx88/cx88-alsa.c
===================================================================
--- linux-2.6.git.orig/drivers/media/video/cx88/cx88-alsa.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/video/cx88/cx88-alsa.c	2006-07-01 16:51:41.000000000 +0200
@@ -700,7 +700,7 @@ static int __devinit snd_cx88_create(str
 
 	/* get irq */
 	err = request_irq(chip->pci->irq, cx8801_irq,
-			  SA_SHIRQ | SA_INTERRUPT, chip->core->name, chip);
+			  IRQF_SHARED | IRQF_DISABLED, chip->core->name, chip);
 	if (err < 0) {
 		dprintk(0, "%s: can't get IRQ %d\n",
 		       chip->core->name, chip->pci->irq);
Index: linux-2.6.git/drivers/media/video/cx88/cx88-mpeg.c
===================================================================
--- linux-2.6.git.orig/drivers/media/video/cx88/cx88-mpeg.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/video/cx88/cx88-mpeg.c	2006-07-01 16:51:41.000000000 +0200
@@ -438,7 +438,7 @@ int cx8802_init_common(struct cx8802_dev
 
 	/* get irq */
 	err = request_irq(dev->pci->irq, cx8802_irq,
-			  SA_SHIRQ | SA_INTERRUPT, dev->core->name, dev);
+			  IRQF_SHARED | IRQF_DISABLED, dev->core->name, dev);
 	if (err < 0) {
 		printk(KERN_ERR "%s: can't get IRQ %d\n",
 		       dev->core->name, dev->pci->irq);
Index: linux-2.6.git/drivers/media/video/cx88/cx88-video.c
===================================================================
--- linux-2.6.git.orig/drivers/media/video/cx88/cx88-video.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/video/cx88/cx88-video.c	2006-07-01 16:51:41.000000000 +0200
@@ -1915,7 +1915,7 @@ static int __devinit cx8800_initdev(stru
 
 	/* get irq */
 	err = request_irq(pci_dev->irq, cx8800_irq,
-			  SA_SHIRQ | SA_INTERRUPT, core->name, dev);
+			  IRQF_SHARED | IRQF_DISABLED, core->name, dev);
 	if (err < 0) {
 		printk(KERN_ERR "%s: can't get IRQ %d\n",
 		       core->name,pci_dev->irq);
Index: linux-2.6.git/drivers/media/video/saa7134/saa7134-alsa.c
===================================================================
--- linux-2.6.git.orig/drivers/media/video/saa7134/saa7134-alsa.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/video/saa7134/saa7134-alsa.c	2006-07-01 16:51:41.000000000 +0200
@@ -929,7 +929,7 @@ static int alsa_card_saa7134_create(stru
 
 
 	err = request_irq(dev->pci->irq, saa7134_alsa_irq,
-				SA_SHIRQ | SA_INTERRUPT, dev->name,
+				IRQF_SHARED | IRQF_DISABLED, dev->name,
 				(void*) &dev->dmasound);
 
 	if (err < 0) {
Index: linux-2.6.git/drivers/media/video/saa7134/saa7134-core.c
===================================================================
--- linux-2.6.git.orig/drivers/media/video/saa7134/saa7134-core.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/video/saa7134/saa7134-core.c	2006-07-01 16:51:41.000000000 +0200
@@ -923,7 +923,7 @@ static int __devinit saa7134_initdev(str
 
 	/* get irq */
 	err = request_irq(pci_dev->irq, saa7134_irq,
-			  SA_SHIRQ | SA_INTERRUPT, dev->name, dev);
+			  IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
 	if (err < 0) {
 		printk(KERN_ERR "%s: can't get IRQ %d\n",
 		       dev->name,pci_dev->irq);
Index: linux-2.6.git/drivers/media/video/saa7134/saa7134-oss.c
===================================================================
--- linux-2.6.git.orig/drivers/media/video/saa7134/saa7134-oss.c	2006-07-01 16:51:17.000000000 +0200
+++ linux-2.6.git/drivers/media/video/saa7134/saa7134-oss.c	2006-07-01 16:51:41.000000000 +0200
@@ -845,7 +845,7 @@ int saa7134_oss_init1(struct saa7134_dev
 {
 
 	if ((request_irq(dev->pci->irq, saa7134_oss_irq,
-			 SA_SHIRQ | SA_INTERRUPT, dev->name,
+			 IRQF_SHARED | IRQF_DISABLED, dev->name,
 			(void*) &dev->dmasound)) < 0)
 		return -1;
 

--


  parent reply	other threads:[~2006-07-01 15:08 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-07-01 14:54 [RFC][patch 00/44] Consolidate irq_action flags Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 01/44] Consolidate flags for request_irq Thomas Gleixner
2006-07-02  0:49   ` Andrew Morton
2006-07-02 13:09     ` Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 02/44] ALPHA: Use the new IRQF_ constansts Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 03/44] ARM26: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 04/44] ARM: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 05/44] CHRIS: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 06/44] FRV: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 07/44] H8300: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 08/44] I386: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 09/44] IA64: " Thomas Gleixner
2006-07-03 11:36   ` Jes Sorensen
2006-07-03 11:56     ` Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 10/44] M32R: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 11/44] M68KNOMMU: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 12/44] M68K: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 13/44] MIPS: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 14/44] PARISC: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 15/44] POWERPC: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 16/44] PPC: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 17/44] S390: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 18/44] SH64: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 19/44] SH: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 20/44] SPARC64: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 21/44] SPARC: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 22/44] UM: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 23/44] V850: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 24/44] x86_64: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 25/44] XTENSA: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 26/44] generic irq: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 27/44] drivers/block " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 28/44] drivers/char: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 29/44] drivers/drm: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 30/44] ide: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 31/44] firewire: " Thomas Gleixner
2006-07-01 14:54 ` [RFC][patch 32/44] isdn: " Thomas Gleixner
2006-07-01 14:54 ` Thomas Gleixner [this message]
2006-07-01 14:54 ` [RFC][patch 34/44] misc drivers: " Thomas Gleixner
2006-07-01 14:55 ` [RFC][patch 35/44] drivers/net: " Thomas Gleixner
2006-07-01 14:55 ` [RFC][patch 36/44] PARISC: " Thomas Gleixner
2006-07-01 14:55 ` [RFC][patch 37/44] pci: " Thomas Gleixner
2006-07-01 14:55 ` [RFC][patch 38/44] rio: " Thomas Gleixner
2006-07-01 14:55 ` [RFC][patch 39/44] scsi: " Thomas Gleixner
2006-07-01 14:55 ` [RFC][patch 40/44] serial: " Thomas Gleixner
2006-07-01 14:55 ` [RFC][patch 41/44] usb: " Thomas Gleixner
2006-07-01 14:55 ` [RFC][patch 42/44] video: " Thomas Gleixner
2006-07-01 14:55 ` [RFC][patch 43/44] sound: " Thomas Gleixner
2006-07-01 14:55 ` [RFC][patch 44/44] Documentation: " Thomas Gleixner
2006-07-01 23:43 ` [RFC][patch 00/44] Consolidate irq_action flags Andrew Morton

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=20060701145227.065417000@cruncher.tec.linutronix.de \
    --to=tglx@linutronix.de \
    --cc=akpm@osdl.org \
    --cc=benh@kernel.crashing.org \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    /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®