leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] irq-flags: drivers/block Use the new IRQF_ constants

Browse Source 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Thomas Gleixner 2006-07-01 19:29:32 -07:00 committed by Linus Torvalds
parent 3cca53b02a
commit 69ab3912d1
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/block/DAC960.c
View File

@ -3014,7 +3014,7 @@ DAC960_DetectController(struct pci_dev *PCI_Device,
Acquire shared access to the IRQ Channel. Acquire shared access to the IRQ Channel.
*/ */
IRQ_Channel = PCI_Device->irq; IRQ_Channel = PCI_Device->irq;
if (request_irq(IRQ_Channel, InterruptHandler, SA_SHIRQ, if (request_irq(IRQ_Channel, InterruptHandler, IRQF_SHARED,
Controller->FullModelName, Controller) < 0) Controller->FullModelName, Controller) < 0)
{ {
DAC960_Error("Unable to acquire IRQ Channel %d for Controller at\n", DAC960_Error("Unable to acquire IRQ Channel %d for Controller at\n",

2
drivers/block/cciss.c
View File

@ -3159,7 +3159,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
/* make sure the board interrupts are off */ /* make sure the board interrupts are off */
hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF); hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF);
if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr, if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr,
SA_INTERRUPT | SA_SHIRQ, hba[i]->devname, hba[i])) { IRQF_DISABLED | IRQF_SHARED, hba[i]->devname, hba[i])) {
printk(KERN_ERR "cciss: Unable to get irq %d for %s\n", printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",
hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname); hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname);
goto clean2; goto clean2;

2
drivers/block/cpqarray.c
View File

@ -408,7 +408,7 @@ static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev)
} }
hba[i]->access.set_intr_mask(hba[i], 0); hba[i]->access.set_intr_mask(hba[i], 0);
if (request_irq(hba[i]->intr, do_ida_intr, if (request_irq(hba[i]->intr, do_ida_intr,
SA_INTERRUPT|SA_SHIRQ, hba[i]->devname, hba[i])) IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
{ {
printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n", printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n",
hba[i]->intr, hba[i]->devname); hba[i]->intr, hba[i]->devname);

4
drivers/block/ps2esdi.c
View File

@ -340,9 +340,9 @@ static int __init ps2esdi_geninit(void)
/* try to grab IRQ, and try to grab a slow IRQ if it fails, so we can /* try to grab IRQ, and try to grab a slow IRQ if it fails, so we can
share with the SCSI driver */ share with the SCSI driver */
if (request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler, if (request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler,
SA_INTERRUPT | SA_SHIRQ, "PS/2 ESDI", &ps2esdi_gendisk) IRQF_DISABLED | IRQF_SHARED, "PS/2 ESDI", &ps2esdi_gendisk)
&& request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler, && request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler,
SA_SHIRQ, "PS/2 ESDI", &ps2esdi_gendisk) IRQF_SHARED, "PS/2 ESDI", &ps2esdi_gendisk)
) { ) {
printk("%s: Unable to get IRQ %d\n", DEVICE_NAME, PS2ESDI_IRQ); printk("%s: Unable to get IRQ %d\n", DEVICE_NAME, PS2ESDI_IRQ);
error = -EBUSY; error = -EBUSY;

2
drivers/block/sx8.c
View File

@ -1676,7 +1676,7 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
pci_set_master(pdev); pci_set_master(pdev);
rc = request_irq(pdev->irq, carm_interrupt, SA_SHIRQ, DRV_NAME, host); rc = request_irq(pdev->irq, carm_interrupt, IRQF_SHARED, DRV_NAME, host);
if (rc) { if (rc) {
printk(KERN_ERR DRV_NAME "(%s): irq alloc failure\n", printk(KERN_ERR DRV_NAME "(%s): irq alloc failure\n",
pci_name(pdev)); pci_name(pdev));

2
drivers/block/umem.c
View File

@ -1040,7 +1040,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
card->win_size = data; card->win_size = data;
if (request_irq(dev->irq, mm_interrupt, SA_SHIRQ, "pci-umem", card)) { if (request_irq(dev->irq, mm_interrupt, IRQF_SHARED, "pci-umem", card)) {
printk(KERN_ERR "MM%d: Unable to allocate IRQ\n", card->card_number); printk(KERN_ERR "MM%d: Unable to allocate IRQ\n", card->card_number);
ret = -ENODEV; ret = -ENODEV;