Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 69ab3912d1b4dbf27ea1a383cb5731251fc0e109

Authored by Thomas Gleixner
Committed by Linus Torvalds
1 parent 3cca53b02a
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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

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>

Showing 6 changed files with 7 additions and 7 deletions Side-by-side Diff

drivers/block/DAC960.c
Diff comments   View file @ 69ab391
... ... @@ -3014,7 +3014,7 @@
3014 3014 Acquire shared access to the IRQ Channel.
3015 3015 */
3016 3016 IRQ_Channel = PCI_Device->irq;
3017   - if (request_irq(IRQ_Channel, InterruptHandler, SA_SHIRQ,
  3017 + if (request_irq(IRQ_Channel, InterruptHandler, IRQF_SHARED,
3018 3018 Controller->FullModelName, Controller) < 0)
3019 3019 {
3020 3020 DAC960_Error("Unable to acquire IRQ Channel %d for Controller at\n",
drivers/block/cciss.c
Diff comments   View file @ 69ab391
... ... @@ -3159,7 +3159,7 @@
3159 3159 /* make sure the board interrupts are off */
3160 3160 hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF);
3161 3161 if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr,
3162   - SA_INTERRUPT | SA_SHIRQ, hba[i]->devname, hba[i])) {
  3162 + IRQF_DISABLED | IRQF_SHARED, hba[i]->devname, hba[i])) {
3163 3163 printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",
3164 3164 hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname);
3165 3165 goto clean2;
drivers/block/cpqarray.c
Diff comments   View file @ 69ab391
... ... @@ -408,7 +408,7 @@
408 408 }
409 409 hba[i]->access.set_intr_mask(hba[i], 0);
410 410 if (request_irq(hba[i]->intr, do_ida_intr,
411   - SA_INTERRUPT|SA_SHIRQ, hba[i]->devname, hba[i]))
  411 + IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
412 412 {
413 413 printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n",
414 414 hba[i]->intr, hba[i]->devname);
drivers/block/ps2esdi.c
Diff comments   View file @ 69ab391
... ... @@ -340,9 +340,9 @@
340 340 /* try to grab IRQ, and try to grab a slow IRQ if it fails, so we can
341 341 share with the SCSI driver */
342 342 if (request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler,
343   - SA_INTERRUPT | SA_SHIRQ, "PS/2 ESDI", &ps2esdi_gendisk)
  343 + IRQF_DISABLED | IRQF_SHARED, "PS/2 ESDI", &ps2esdi_gendisk)
344 344 && request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler,
345   - SA_SHIRQ, "PS/2 ESDI", &ps2esdi_gendisk)
  345 + IRQF_SHARED, "PS/2 ESDI", &ps2esdi_gendisk)
346 346 ) {
347 347 printk("%s: Unable to get IRQ %d\n", DEVICE_NAME, PS2ESDI_IRQ);
348 348 error = -EBUSY;
... ... @@ -1676,7 +1676,7 @@
1676 1676  
1677 1677 pci_set_master(pdev);
1678 1678  
1679   - rc = request_irq(pdev->irq, carm_interrupt, SA_SHIRQ, DRV_NAME, host);
  1679 + rc = request_irq(pdev->irq, carm_interrupt, IRQF_SHARED, DRV_NAME, host);
1680 1680 if (rc) {
1681 1681 printk(KERN_ERR DRV_NAME "(%s): irq alloc failure\n",
1682 1682 pci_name(pdev));
drivers/block/umem.c
Diff comments   View file @ 69ab391
... ... @@ -1040,7 +1040,7 @@
1040 1040 card->win_size = data;
1041 1041  
1042 1042  
1043   - if (request_irq(dev->irq, mm_interrupt, SA_SHIRQ, "pci-umem", card)) {
  1043 + if (request_irq(dev->irq, mm_interrupt, IRQF_SHARED, "pci-umem", card)) {
1044 1044 printk(KERN_ERR "MM%d: Unable to allocate IRQ\n", card->card_number);
1045 1045 ret = -ENODEV;
1046 1046