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

[PATCH] irq-flags: scsi: 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: James Bottomley <James.Bottomley@steeleye.com>
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:42 -07:00 committed by Linus Torvalds
parent 5d8c8a2e8e
commit 1d6f359a2e
84 changed files with 108 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/3w-9xxx.c
View File

@ -2122,7 +2122,7 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
TW_PARAM_PORTCOUNT, TW_PARAM_PORTCOUNT_LENGTH))); TW_PARAM_PORTCOUNT, TW_PARAM_PORTCOUNT_LENGTH)));
/* Now setup the interrupt handler */ /* Now setup the interrupt handler */
retval = request_irq(pdev->irq, twa_interrupt, SA_SHIRQ, "3w-9xxx", tw_dev); retval = request_irq(pdev->irq, twa_interrupt, IRQF_SHARED, "3w-9xxx", tw_dev);
if (retval) { if (retval) {
TW_PRINTK(tw_dev->host, TW_DRIVER, 0x30, "Error requesting IRQ"); TW_PRINTK(tw_dev->host, TW_DRIVER, 0x30, "Error requesting IRQ");
goto out_remove_host; goto out_remove_host;

2
drivers/scsi/3w-xxxx.c
View File

@ -2397,7 +2397,7 @@ static int __devinit tw_probe(struct pci_dev *pdev, const struct pci_device_id *
printk(KERN_WARNING "3w-xxxx: scsi%d: Found a 3ware Storage Controller at 0x%x, IRQ: %d.\n", host->host_no, tw_dev->base_addr, pdev->irq); printk(KERN_WARNING "3w-xxxx: scsi%d: Found a 3ware Storage Controller at 0x%x, IRQ: %d.\n", host->host_no, tw_dev->base_addr, pdev->irq);
/* Now setup the interrupt handler */ /* Now setup the interrupt handler */
retval = request_irq(pdev->irq, tw_interrupt, SA_SHIRQ, "3w-xxxx", tw_dev); retval = request_irq(pdev->irq, tw_interrupt, IRQF_SHARED, "3w-xxxx", tw_dev);
if (retval) { if (retval) {
printk(KERN_WARNING "3w-xxxx: Error requesting IRQ."); printk(KERN_WARNING "3w-xxxx: Error requesting IRQ.");
goto out_remove_host; goto out_remove_host;

4
drivers/scsi/53c7xx.c
View File

@ -1070,7 +1070,7 @@ NCR53c7x0_init (struct Scsi_Host *host) {
NCR53c7x0_driver_init (host); NCR53c7x0_driver_init (host);
if (request_irq(host->irq, NCR53c7x0_intr, SA_SHIRQ, "53c7xx", host)) if (request_irq(host->irq, NCR53c7x0_intr, IRQF_SHARED, "53c7xx", host))
{ {
printk("scsi%d : IRQ%d not free, detaching\n", printk("scsi%d : IRQ%d not free, detaching\n",
host->host_no, host->irq); host->host_no, host->irq);
@ -4232,7 +4232,7 @@ restart:
* Purpose : handle NCR53c7x0 interrupts for all NCR devices sharing * Purpose : handle NCR53c7x0 interrupts for all NCR devices sharing
* the same IRQ line. * the same IRQ line.
* *
* Inputs : Since we're using the SA_INTERRUPT interrupt handler * Inputs : Since we're using the IRQF_DISABLED interrupt handler
* semantics, irq indicates the interrupt which invoked * semantics, irq indicates the interrupt which invoked
* this handler. * this handler.
* *

2
drivers/scsi/BusLogic.c
View File

@ -1844,7 +1844,7 @@ static boolean __init BusLogic_AcquireResources(struct BusLogic_HostAdapter *Hos
/* /*
Acquire shared access to the IRQ Channel. Acquire shared access to the IRQ Channel.
*/ */
if (request_irq(HostAdapter->IRQ_Channel, BusLogic_InterruptHandler, SA_SHIRQ, HostAdapter->FullModelName, HostAdapter) < 0) { if (request_irq(HostAdapter->IRQ_Channel, BusLogic_InterruptHandler, IRQF_SHARED, HostAdapter->FullModelName, HostAdapter) < 0) {
BusLogic_Error("UNABLE TO ACQUIRE IRQ CHANNEL %d - DETACHING\n", HostAdapter, HostAdapter->IRQ_Channel); BusLogic_Error("UNABLE TO ACQUIRE IRQ CHANNEL %d - DETACHING\n", HostAdapter, HostAdapter->IRQ_Channel);
return false; return false;
} }

2
drivers/scsi/NCR5380.c
View File

@ -585,7 +585,7 @@ static int __init NCR5380_probe_irq(struct Scsi_Host *instance, int possible)
NCR5380_setup(instance); NCR5380_setup(instance);
for (trying_irqs = i = 0, mask = 1; i < 16; ++i, mask <<= 1) for (trying_irqs = i = 0, mask = 1; i < 16; ++i, mask <<= 1)
if ((mask & possible) && (request_irq(i, &probe_intr, SA_INTERRUPT, "NCR-probe", NULL) == 0)) if ((mask & possible) && (request_irq(i, &probe_intr, IRQF_DISABLED, "NCR-probe", NULL) == 0))
trying_irqs |= mask; trying_irqs |= mask;
timeout = jiffies + (250 * HZ / 1000); timeout = jiffies + (250 * HZ / 1000);

2
drivers/scsi/NCR_D700.c
View File

@ -320,7 +320,7 @@ NCR_D700_probe(struct device *dev)
memset(p, '\0', sizeof(*p)); memset(p, '\0', sizeof(*p));
p->dev = dev; p->dev = dev;
snprintf(p->name, sizeof(p->name), "D700(%s)", dev->bus_id); snprintf(p->name, sizeof(p->name), "D700(%s)", dev->bus_id);
if (request_irq(irq, NCR_D700_intr, SA_SHIRQ, p->name, p)) { if (request_irq(irq, NCR_D700_intr, IRQF_SHARED, p->name, p)) {
printk(KERN_ERR "D700: request_irq failed\n"); printk(KERN_ERR "D700: request_irq failed\n");
kfree(p); kfree(p);
return -EBUSY; return -EBUSY;

2
drivers/scsi/NCR_Q720.c
View File

@ -265,7 +265,7 @@ NCR_Q720_probe(struct device *dev)
p->irq = irq; p->irq = irq;
p->siops = siops; p->siops = siops;
if (request_irq(irq, NCR_Q720_intr, SA_SHIRQ, "NCR_Q720", p)) { if (request_irq(irq, NCR_Q720_intr, IRQF_SHARED, "NCR_Q720", p)) {
printk(KERN_ERR "NCR_Q720: request irq %d failed\n", irq); printk(KERN_ERR "NCR_Q720: request irq %d failed\n", irq);
goto out_release; goto out_release;
} }

2
drivers/scsi/a100u2w.c
View File

@ -1120,7 +1120,7 @@ static int __devinit inia100_probe_one(struct pci_dev *pdev,
shost->sg_tablesize = TOTAL_SG_ENTRY; shost->sg_tablesize = TOTAL_SG_ENTRY;
/* Initial orc chip */ /* Initial orc chip */
error = request_irq(pdev->irq, inia100_intr, SA_SHIRQ, error = request_irq(pdev->irq, inia100_intr, IRQF_SHARED,
"inia100", shost); "inia100", shost);
if (error < 0) { if (error < 0) {
printk(KERN_WARNING "inia100: unable to get irq %d\n", printk(KERN_WARNING "inia100: unable to get irq %d\n",

2
drivers/scsi/a2091.c
View File

@ -208,7 +208,7 @@ int __init a2091_detect(struct scsi_host_template *tpnt)
regs.SASR = &(DMA(instance)->SASR); regs.SASR = &(DMA(instance)->SASR);
regs.SCMD = &(DMA(instance)->SCMD); regs.SCMD = &(DMA(instance)->SCMD);
wd33c93_init(instance, regs, dma_setup, dma_stop, WD33C93_FS_8_10); wd33c93_init(instance, regs, dma_setup, dma_stop, WD33C93_FS_8_10);
request_irq(IRQ_AMIGA_PORTS, a2091_intr, SA_SHIRQ, "A2091 SCSI", request_irq(IRQ_AMIGA_PORTS, a2091_intr, IRQF_SHARED, "A2091 SCSI",
instance); instance);
DMA(instance)->CNTR = CNTR_PDMD | CNTR_INTEN; DMA(instance)->CNTR = CNTR_PDMD | CNTR_INTEN;
num_a2091++; num_a2091++;

2
drivers/scsi/a3000.c
View File

@ -190,7 +190,7 @@ int __init a3000_detect(struct scsi_host_template *tpnt)
regs.SASR = &(DMA(a3000_host)->SASR); regs.SASR = &(DMA(a3000_host)->SASR);
regs.SCMD = &(DMA(a3000_host)->SCMD); regs.SCMD = &(DMA(a3000_host)->SCMD);
wd33c93_init(a3000_host, regs, dma_setup, dma_stop, WD33C93_FS_12_15); wd33c93_init(a3000_host, regs, dma_setup, dma_stop, WD33C93_FS_12_15);
if (request_irq(IRQ_AMIGA_PORTS, a3000_intr, SA_SHIRQ, "A3000 SCSI", if (request_irq(IRQ_AMIGA_PORTS, a3000_intr, IRQF_SHARED, "A3000 SCSI",
a3000_intr)) a3000_intr))
goto fail_irq; goto fail_irq;
DMA(a3000_host)->CNTR = CNTR_PDMD | CNTR_INTEN; DMA(a3000_host)->CNTR = CNTR_PDMD | CNTR_INTEN;

2
drivers/scsi/aacraid/rkt.c
View File

@ -453,7 +453,7 @@ int aac_rkt_init(struct aac_dev *dev)
} }
msleep(1); msleep(1);
} }
if (request_irq(dev->scsi_host_ptr->irq, aac_rkt_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)<0) if (request_irq(dev->scsi_host_ptr->irq, aac_rkt_intr, IRQF_SHARED|IRQF_DISABLED, "aacraid", (void *)dev)<0)
{ {
printk(KERN_ERR "%s%d: Interrupt unavailable.\n", name, instance); printk(KERN_ERR "%s%d: Interrupt unavailable.\n", name, instance);
goto error_iounmap; goto error_iounmap;

2
drivers/scsi/aacraid/rx.c
View File

@ -453,7 +453,7 @@ int aac_rx_init(struct aac_dev *dev)
} }
msleep(1); msleep(1);
} }
if (request_irq(dev->scsi_host_ptr->irq, aac_rx_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)<0) if (request_irq(dev->scsi_host_ptr->irq, aac_rx_intr, IRQF_SHARED|IRQF_DISABLED, "aacraid", (void *)dev)<0)
{ {
printk(KERN_ERR "%s%d: Interrupt unavailable.\n", name, instance); printk(KERN_ERR "%s%d: Interrupt unavailable.\n", name, instance);
goto error_iounmap; goto error_iounmap;

2
drivers/scsi/aacraid/sa.c
View File

@ -327,7 +327,7 @@ int aac_sa_init(struct aac_dev *dev)
msleep(1); msleep(1);
} }
if (request_irq(dev->scsi_host_ptr->irq, aac_sa_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev ) < 0) { if (request_irq(dev->scsi_host_ptr->irq, aac_sa_intr, IRQF_SHARED|IRQF_DISABLED, "aacraid", (void *)dev ) < 0) {
printk(KERN_WARNING "%s%d: Interrupt unavailable.\n", name, instance); printk(KERN_WARNING "%s%d: Interrupt unavailable.\n", name, instance);
goto error_iounmap; goto error_iounmap;
} }

18
drivers/scsi/advansys.c
View File

@ -371,7 +371,7 @@
1.5 (8/8/96): 1.5 (8/8/96):
1. Add support for ABP-940U (PCI Ultra) adapter. 1. Add support for ABP-940U (PCI Ultra) adapter.
2. Add support for IRQ sharing by setting the SA_SHIRQ flag for 2. Add support for IRQ sharing by setting the IRQF_SHARED flag for
request_irq and supplying a dev_id pointer to both request_irq() request_irq and supplying a dev_id pointer to both request_irq()
and free_irq(). and free_irq().
3. In AscSearchIOPortAddr11() restore a call to check_region() which 3. In AscSearchIOPortAddr11() restore a call to check_region() which
@ -504,9 +504,9 @@
3. For v2.1.93 and newer kernels use CONFIG_PCI and new PCI BIOS 3. For v2.1.93 and newer kernels use CONFIG_PCI and new PCI BIOS
access functions. access functions.
4. Update board serial number printing. 4. Update board serial number printing.
5. Try allocating an IRQ both with and without the SA_INTERRUPT 5. Try allocating an IRQ both with and without the IRQF_DISABLED
flag set to allow IRQ sharing with drivers that do not set flag set to allow IRQ sharing with drivers that do not set
the SA_INTERRUPT flag. Also display a more descriptive error the IRQF_DISABLED flag. Also display a more descriptive error
message if request_irq() fails. message if request_irq() fails.
6. Update to latest Asc and Adv Libraries. 6. Update to latest Asc and Adv Libraries.
@ -5202,19 +5202,19 @@ advansys_detect(struct scsi_host_template *tpnt)
/* Register IRQ Number. */ /* Register IRQ Number. */
ASC_DBG1(2, "advansys_detect: request_irq() %d\n", shp->irq); ASC_DBG1(2, "advansys_detect: request_irq() %d\n", shp->irq);
/* /*
* If request_irq() fails with the SA_INTERRUPT flag set, * If request_irq() fails with the IRQF_DISABLED flag set,
* then try again without the SA_INTERRUPT flag set. This * then try again without the IRQF_DISABLED flag set. This
* allows IRQ sharing to work even with other drivers that * allows IRQ sharing to work even with other drivers that
* do not set the SA_INTERRUPT flag. * do not set the IRQF_DISABLED flag.
* *
* If SA_INTERRUPT is not set, then interrupts are enabled * If IRQF_DISABLED is not set, then interrupts are enabled
* before the driver interrupt function is called. * before the driver interrupt function is called.
*/ */
if (((ret = request_irq(shp->irq, advansys_interrupt, if (((ret = request_irq(shp->irq, advansys_interrupt,
SA_INTERRUPT | (share_irq == TRUE ? SA_SHIRQ : 0), IRQF_DISABLED | (share_irq == TRUE ? IRQF_SHARED : 0),
"advansys", boardp)) != 0) && "advansys", boardp)) != 0) &&
((ret = request_irq(shp->irq, advansys_interrupt, ((ret = request_irq(shp->irq, advansys_interrupt,
(share_irq == TRUE ? SA_SHIRQ : 0), (share_irq == TRUE ? IRQF_SHARED : 0),
"advansys", boardp)) != 0)) "advansys", boardp)) != 0))
{ {
if (ret == -EBUSY) { if (ret == -EBUSY) {

4
drivers/scsi/aha152x.c
View File

@ -855,7 +855,7 @@ struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *setup)
SETPORT(SIMODE0, 0); SETPORT(SIMODE0, 0);
SETPORT(SIMODE1, 0); SETPORT(SIMODE1, 0);
if( request_irq(shpnt->irq, swintr, SA_INTERRUPT|SA_SHIRQ, "aha152x", shpnt) ) { if( request_irq(shpnt->irq, swintr, IRQF_DISABLED|IRQF_SHARED, "aha152x", shpnt) ) {
printk(KERN_ERR "aha152x%d: irq %d busy.\n", shpnt->host_no, shpnt->irq); printk(KERN_ERR "aha152x%d: irq %d busy.\n", shpnt->host_no, shpnt->irq);
goto out_host_put; goto out_host_put;
} }
@ -889,7 +889,7 @@ struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *setup)
SETPORT(SSTAT0, 0x7f); SETPORT(SSTAT0, 0x7f);
SETPORT(SSTAT1, 0xef); SETPORT(SSTAT1, 0xef);
if ( request_irq(shpnt->irq, intr, SA_INTERRUPT|SA_SHIRQ, "aha152x", shpnt) ) { if ( request_irq(shpnt->irq, intr, IRQF_DISABLED|IRQF_SHARED, "aha152x", shpnt) ) {
printk(KERN_ERR "aha152x%d: failed to reassign irq %d.\n", shpnt->host_no, shpnt->irq); printk(KERN_ERR "aha152x%d: failed to reassign irq %d.\n", shpnt->host_no, shpnt->irq);
goto out_host_put; goto out_host_put;
} }

2
drivers/scsi/aha1740.c
View File

@ -634,7 +634,7 @@ static int aha1740_probe (struct device *dev)
} }
DEB(printk("aha1740_probe: enable interrupt channel %d\n",irq_level)); DEB(printk("aha1740_probe: enable interrupt channel %d\n",irq_level));
if (request_irq(irq_level,aha1740_intr_handle,irq_type ? 0 : SA_SHIRQ, if (request_irq(irq_level,aha1740_intr_handle,irq_type ? 0 : IRQF_SHARED,
"aha1740",shpnt)) { "aha1740",shpnt)) {
printk(KERN_ERR "aha1740_probe: Unable to allocate IRQ %d.\n", printk(KERN_ERR "aha1740_probe: Unable to allocate IRQ %d.\n",
irq_level); irq_level);

2
drivers/scsi/ahci.c
View File

@ -1371,7 +1371,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
probe_ent->port_ops = ahci_port_info[board_idx].port_ops; probe_ent->port_ops = ahci_port_info[board_idx].port_ops;
probe_ent->irq = pdev->irq; probe_ent->irq = pdev->irq;
probe_ent->irq_flags = SA_SHIRQ; probe_ent->irq_flags = IRQF_SHARED;
probe_ent->mmio_base = mmio_base; probe_ent->mmio_base = mmio_base;
probe_ent->private_data = hpriv; probe_ent->private_data = hpriv;

2
drivers/scsi/aic7xxx/aic7770_osm.c
View File

@ -65,7 +65,7 @@ aic7770_map_int(struct ahc_softc *ahc, u_int irq)
shared = 0; shared = 0;
if ((ahc->flags & AHC_EDGE_INTERRUPT) == 0) if ((ahc->flags & AHC_EDGE_INTERRUPT) == 0)
shared = SA_SHIRQ; shared = IRQF_SHARED;
error = request_irq(irq, ahc_linux_isr, shared, "aic7xxx", ahc); error = request_irq(irq, ahc_linux_isr, shared, "aic7xxx", ahc);
if (error == 0) if (error == 0)

2
drivers/scsi/aic7xxx/aic79xx_osm_pci.c
View File

@ -342,7 +342,7 @@ ahd_pci_map_int(struct ahd_softc *ahd)
int error; int error;
error = request_irq(ahd->dev_softc->irq, ahd_linux_isr, error = request_irq(ahd->dev_softc->irq, ahd_linux_isr,
SA_SHIRQ, "aic79xx", ahd); IRQF_SHARED, "aic79xx", ahd);
if (!error) if (!error)
ahd->platform_data->irq = ahd->dev_softc->irq; ahd->platform_data->irq = ahd->dev_softc->irq;

2
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
View File

@ -375,7 +375,7 @@ ahc_pci_map_int(struct ahc_softc *ahc)
int error; int error;
error = request_irq(ahc->dev_softc->irq, ahc_linux_isr, error = request_irq(ahc->dev_softc->irq, ahc_linux_isr,
SA_SHIRQ, "aic7xxx", ahc); IRQF_SHARED, "aic7xxx", ahc);
if (error == 0) if (error == 0)
ahc->platform_data->irq = ahc->dev_softc->irq; ahc->platform_data->irq = ahc->dev_softc->irq;

4
drivers/scsi/aic7xxx_old.c
View File

@ -8322,11 +8322,11 @@ aic7xxx_register(struct scsi_host_template *template, struct aic7xxx_host *p,
} }
else else
{ {
result = (request_irq(p->irq, do_aic7xxx_isr, SA_SHIRQ, result = (request_irq(p->irq, do_aic7xxx_isr, IRQF_SHARED,
"aic7xxx", p)); "aic7xxx", p));
if (result < 0) if (result < 0)
{ {
result = (request_irq(p->irq, do_aic7xxx_isr, SA_INTERRUPT | SA_SHIRQ, result = (request_irq(p->irq, do_aic7xxx_isr, IRQF_DISABLED | IRQF_SHARED,
"aic7xxx", p)); "aic7xxx", p));
} }
} }

2
drivers/scsi/arm/acornscsi.c
View File

@ -3030,7 +3030,7 @@ acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
if (!request_region(host->io_port, 2048, "acornscsi(ram)")) if (!request_region(host->io_port, 2048, "acornscsi(ram)"))
goto err_5; goto err_5;
ret = request_irq(host->irq, acornscsi_intr, SA_INTERRUPT, "acornscsi", ashost); ret = request_irq(host->irq, acornscsi_intr, IRQF_DISABLED, "acornscsi", ashost);
if (ret) { if (ret) {
printk(KERN_CRIT "scsi%d: IRQ%d not free: %d\n", printk(KERN_CRIT "scsi%d: IRQ%d not free: %d\n",
host->host_no, ashost->scsi.irq, ret); host->host_no, ashost->scsi.irq, ret);

2
drivers/scsi/arm/cumana_1.c
View File

@ -277,7 +277,7 @@ cumanascsi1_probe(struct expansion_card *ec, const struct ecard_id *id)
((struct NCR5380_hostdata *)host->hostdata)->ctrl = 0; ((struct NCR5380_hostdata *)host->hostdata)->ctrl = 0;
outb(0x00, host->io_port - 577); outb(0x00, host->io_port - 577);
ret = request_irq(host->irq, cumanascsi_intr, SA_INTERRUPT, ret = request_irq(host->irq, cumanascsi_intr, IRQF_DISABLED,
"CumanaSCSI-1", host); "CumanaSCSI-1", host);
if (ret) { if (ret) {
printk("scsi%d: IRQ%d not free: %d\n", printk("scsi%d: IRQ%d not free: %d\n",

2
drivers/scsi/arm/cumana_2.c
View File

@ -460,7 +460,7 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
goto out_free; goto out_free;
ret = request_irq(ec->irq, cumanascsi_2_intr, ret = request_irq(ec->irq, cumanascsi_2_intr,
SA_INTERRUPT, "cumanascsi2", info); IRQF_DISABLED, "cumanascsi2", info);
if (ret) { if (ret) {
printk("scsi%d: IRQ%d not free: %d\n", printk("scsi%d: IRQ%d not free: %d\n",
host->host_no, ec->irq, ret); host->host_no, ec->irq, ret);

2
drivers/scsi/arm/powertec.c
View File

@ -373,7 +373,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
goto out_free; goto out_free;
ret = request_irq(ec->irq, powertecscsi_intr, ret = request_irq(ec->irq, powertecscsi_intr,
SA_INTERRUPT, "powertec", info); IRQF_DISABLED, "powertec", info);
if (ret) { if (ret) {
printk("scsi%d: IRQ%d not free: %d\n", printk("scsi%d: IRQ%d not free: %d\n",
host->host_no, ec->irq, ret); host->host_no, ec->irq, ret);

6
drivers/scsi/atp870u.c
View File

@ -2751,7 +2751,7 @@ flash_ok_880:
goto unregister; goto unregister;
} }
if (request_irq(pdev->irq, atp870u_intr_handle, SA_SHIRQ, "atp880i", shpnt)) { if (request_irq(pdev->irq, atp870u_intr_handle, IRQF_SHARED, "atp880i", shpnt)) {
printk(KERN_ERR "Unable to allocate IRQ%d for Acard controller.\n", pdev->irq); printk(KERN_ERR "Unable to allocate IRQ%d for Acard controller.\n", pdev->irq);
goto free_tables; goto free_tables;
} }
@ -2822,7 +2822,7 @@ flash_ok_880:
#ifdef ED_DBGP #ifdef ED_DBGP
printk("request_irq() shpnt %p hostdata %p\n", shpnt, p); printk("request_irq() shpnt %p hostdata %p\n", shpnt, p);
#endif #endif
if (request_irq(pdev->irq, atp870u_intr_handle, SA_SHIRQ, "atp870u", shpnt)) { if (request_irq(pdev->irq, atp870u_intr_handle, IRQF_SHARED, "atp870u", shpnt)) {
printk(KERN_ERR "Unable to allocate IRQ for Acard controller.\n"); printk(KERN_ERR "Unable to allocate IRQ for Acard controller.\n");
goto free_tables; goto free_tables;
} }
@ -3004,7 +3004,7 @@ flash_ok_885:
if (atp870u_init_tables(shpnt) < 0) if (atp870u_init_tables(shpnt) < 0)
goto unregister; goto unregister;
if (request_irq(pdev->irq, atp870u_intr_handle, SA_SHIRQ, "atp870i", shpnt)) { if (request_irq(pdev->irq, atp870u_intr_handle, IRQF_SHARED, "atp870i", shpnt)) {
printk(KERN_ERR "Unable to allocate IRQ%d for Acard controller.\n", pdev->irq); printk(KERN_ERR "Unable to allocate IRQ%d for Acard controller.\n", pdev->irq);
goto free_tables; goto free_tables;
} }

2
drivers/scsi/blz1230.c
View File

@ -172,7 +172,7 @@ int __init blz1230_esp_detect(struct scsi_host_template *tpnt)
esp->irq = IRQ_AMIGA_PORTS; esp->irq = IRQ_AMIGA_PORTS;
esp->slot = board+REAL_BLZ1230_ESP_ADDR; esp->slot = board+REAL_BLZ1230_ESP_ADDR;
if (request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ, if (request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,
"Blizzard 1230 SCSI IV", esp->ehost)) "Blizzard 1230 SCSI IV", esp->ehost))
goto err_out; goto err_out;

2
drivers/scsi/blz2060.c
View File

@ -146,7 +146,7 @@ int __init blz2060_esp_detect(struct scsi_host_template *tpnt)
esp->esp_command_dvma = virt_to_bus((void *)cmd_buffer); esp->esp_command_dvma = virt_to_bus((void *)cmd_buffer);
esp->irq = IRQ_AMIGA_PORTS; esp->irq = IRQ_AMIGA_PORTS;
request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ, request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,
"Blizzard 2060 SCSI", esp->ehost); "Blizzard 2060 SCSI", esp->ehost);
/* Figure out our scsi ID on the bus */ /* Figure out our scsi ID on the bus */

2
drivers/scsi/cyberstorm.c
View File

@ -172,7 +172,7 @@ int __init cyber_esp_detect(struct scsi_host_template *tpnt)
esp->esp_command_dvma = virt_to_bus((void *)cmd_buffer); esp->esp_command_dvma = virt_to_bus((void *)cmd_buffer);
esp->irq = IRQ_AMIGA_PORTS; esp->irq = IRQ_AMIGA_PORTS;
request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ, request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,
"CyberStorm SCSI", esp->ehost); "CyberStorm SCSI", esp->ehost);
/* Figure out our scsi ID on the bus */ /* Figure out our scsi ID on the bus */
/* The DMA cond flag contains a hardcoded jumper bit /* The DMA cond flag contains a hardcoded jumper bit

2
drivers/scsi/cyberstormII.c
View File

@ -153,7 +153,7 @@ int __init cyberII_esp_detect(struct scsi_host_template *tpnt)
esp->esp_command_dvma = virt_to_bus((void *)cmd_buffer); esp->esp_command_dvma = virt_to_bus((void *)cmd_buffer);
esp->irq = IRQ_AMIGA_PORTS; esp->irq = IRQ_AMIGA_PORTS;
request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ, request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,
"CyberStorm SCSI Mk II", esp->ehost); "CyberStorm SCSI Mk II", esp->ehost);
/* Figure out our scsi ID on the bus */ /* Figure out our scsi ID on the bus */

2
drivers/scsi/dc395x.c
View File

@ -4562,7 +4562,7 @@ static int __devinit adapter_init(struct AdapterCtlBlk *acb,
acb->io_port_base = io_port; acb->io_port_base = io_port;
acb->io_port_len = io_port_len; acb->io_port_len = io_port_len;
if (request_irq(irq, dc395x_interrupt, SA_SHIRQ, DC395X_NAME, acb)) { if (request_irq(irq, dc395x_interrupt, IRQF_SHARED, DC395X_NAME, acb)) {
/* release the region we just claimed */ /* release the region we just claimed */
dprintkl(KERN_INFO, "Failed to register IRQ\n"); dprintkl(KERN_INFO, "Failed to register IRQ\n");
goto failed; goto failed;

10
drivers/scsi/dec_esp.c
View File

@ -202,19 +202,19 @@ static int dec_esp_detect(struct scsi_host_template * tpnt)
esp_initialize(esp); esp_initialize(esp);
if (request_irq(esp->irq, esp_intr, SA_INTERRUPT, if (request_irq(esp->irq, esp_intr, IRQF_DISABLED,
"ncr53c94", esp->ehost)) "ncr53c94", esp->ehost))
goto err_dealloc; goto err_dealloc;
if (request_irq(dec_interrupt[DEC_IRQ_ASC_MERR], if (request_irq(dec_interrupt[DEC_IRQ_ASC_MERR],
scsi_dma_merr_int, SA_INTERRUPT, scsi_dma_merr_int, IRQF_DISABLED,
"ncr53c94 error", esp->ehost)) "ncr53c94 error", esp->ehost))
goto err_free_irq; goto err_free_irq;
if (request_irq(dec_interrupt[DEC_IRQ_ASC_ERR], if (request_irq(dec_interrupt[DEC_IRQ_ASC_ERR],
scsi_dma_err_int, SA_INTERRUPT, scsi_dma_err_int, IRQF_DISABLED,
"ncr53c94 overrun", esp->ehost)) "ncr53c94 overrun", esp->ehost))
goto err_free_irq_merr; goto err_free_irq_merr;
if (request_irq(dec_interrupt[DEC_IRQ_ASC_DMA], if (request_irq(dec_interrupt[DEC_IRQ_ASC_DMA],
scsi_dma_int, SA_INTERRUPT, scsi_dma_int, IRQF_DISABLED,
"ncr53c94 dma", esp->ehost)) "ncr53c94 dma", esp->ehost))
goto err_free_irq_err; goto err_free_irq_err;
@ -276,7 +276,7 @@ static int dec_esp_detect(struct scsi_host_template * tpnt)
esp->dma_mmu_release_scsi_sgl = 0; esp->dma_mmu_release_scsi_sgl = 0;
esp->dma_advance_sg = 0; esp->dma_advance_sg = 0;
if (request_irq(esp->irq, esp_intr, SA_INTERRUPT, if (request_irq(esp->irq, esp_intr, IRQF_DISABLED,
"PMAZ_AA", esp->ehost)) { "PMAZ_AA", esp->ehost)) {
esp_deallocate(esp); esp_deallocate(esp);
release_tc_card(slot); release_tc_card(slot);

2
drivers/scsi/dmx3191d.c
View File

@ -94,7 +94,7 @@ static int __devinit dmx3191d_probe_one(struct pci_dev *pdev,
NCR5380_init(shost, FLAG_NO_PSEUDO_DMA | FLAG_DTC3181E); NCR5380_init(shost, FLAG_NO_PSEUDO_DMA | FLAG_DTC3181E);
if (request_irq(pdev->irq, NCR5380_intr, SA_SHIRQ, if (request_irq(pdev->irq, NCR5380_intr, IRQF_SHARED,
DMX3191D_DRIVER_NAME, shost)) { DMX3191D_DRIVER_NAME, shost)) {
/* /*
* Steam powered scsi controllers run without an IRQ anyway * Steam powered scsi controllers run without an IRQ anyway

2
drivers/scsi/dpt_i2o.c
View File

@ -1009,7 +1009,7 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
printk(KERN_INFO" BAR1 %p - size= %x\n",msg_addr_virt,hba_map1_area_size); printk(KERN_INFO" BAR1 %p - size= %x\n",msg_addr_virt,hba_map1_area_size);
} }
if (request_irq (pDev->irq, adpt_isr, SA_SHIRQ, pHba->name, pHba)) { if (request_irq (pDev->irq, adpt_isr, IRQF_SHARED, pHba->name, pHba)) {
printk(KERN_ERR"%s: Couldn't register IRQ %d\n", pHba->name, pDev->irq); printk(KERN_ERR"%s: Couldn't register IRQ %d\n", pHba->name, pDev->irq);
adpt_i2o_delete_hba(pHba); adpt_i2o_delete_hba(pHba);
return -EINVAL; return -EINVAL;

2
drivers/scsi/dtc.c
View File

@ -280,7 +280,7 @@ found:
/* With interrupts enabled, it will sometimes hang when doing heavy /* With interrupts enabled, it will sometimes hang when doing heavy
* reads. So better not enable them until I finger it out. */ * reads. So better not enable them until I finger it out. */
if (instance->irq != SCSI_IRQ_NONE) if (instance->irq != SCSI_IRQ_NONE)
if (request_irq(instance->irq, dtc_intr, SA_INTERRUPT, "dtc", instance)) { if (request_irq(instance->irq, dtc_intr, IRQF_DISABLED, "dtc", instance)) {
printk(KERN_ERR "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq); printk(KERN_ERR "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq);
instance->irq = SCSI_IRQ_NONE; instance->irq = SCSI_IRQ_NONE;
} }

2
drivers/scsi/eata.c
View File

@ -1221,7 +1221,7 @@ static int port_detect(unsigned long port_base, unsigned int j,
/* Board detected, allocate its IRQ */ /* Board detected, allocate its IRQ */
if (request_irq(irq, do_interrupt_handler, if (request_irq(irq, do_interrupt_handler,
SA_INTERRUPT | ((subversion == ESA) ? SA_SHIRQ : 0), IRQF_DISABLED | ((subversion == ESA) ? IRQF_SHARED : 0),
driver_name, (void *)&sha[j])) { driver_name, (void *)&sha[j])) {
printk("%s: unable to allocate IRQ %u, detaching.\n", name, printk("%s: unable to allocate IRQ %u, detaching.\n", name,
irq); irq);

4
drivers/scsi/eata_pio.c
View File

@ -731,7 +731,7 @@ static int register_pio_HBA(long base, struct get_conf *gc)
return 0; return 0;
if (!reg_IRQ[gc->IRQ]) { /* Interrupt already registered ? */ if (!reg_IRQ[gc->IRQ]) { /* Interrupt already registered ? */
if (!request_irq(gc->IRQ, do_eata_pio_int_handler, SA_INTERRUPT, "EATA-PIO", sh)) { if (!request_irq(gc->IRQ, do_eata_pio_int_handler, IRQF_DISABLED, "EATA-PIO", sh)) {
reg_IRQ[gc->IRQ]++; reg_IRQ[gc->IRQ]++;
if (!gc->IRQ_TR) if (!gc->IRQ_TR)
reg_IRQL[gc->IRQ] = 1; /* IRQ is edge triggered */ reg_IRQL[gc->IRQ] = 1; /* IRQ is edge triggered */
@ -965,7 +965,7 @@ static int eata_pio_detect(struct scsi_host_template *tpnt)
for (i = 0; i <= MAXIRQ; i++) for (i = 0; i <= MAXIRQ; i++)
if (reg_IRQ[i]) if (reg_IRQ[i])
request_irq(i, do_eata_pio_int_handler, SA_INTERRUPT, "EATA-PIO", NULL); request_irq(i, do_eata_pio_int_handler, IRQF_DISABLED, "EATA-PIO", NULL);
HBA_ptr = first_HBA; HBA_ptr = first_HBA;

2
drivers/scsi/esp.c
View File

@ -778,7 +778,7 @@ static int __init esp_register_irq(struct esp *esp)
* sanely maintain. * sanely maintain.
*/ */
if (request_irq(esp->ehost->irq, esp_intr, if (request_irq(esp->ehost->irq, esp_intr,
SA_SHIRQ, "ESP SCSI", esp)) { IRQF_SHARED, "ESP SCSI", esp)) {
printk("esp%d: Cannot acquire irq line\n", printk("esp%d: Cannot acquire irq line\n",
esp->esp_id); esp->esp_id);
return -1; return -1;

2
drivers/scsi/fastlane.c
View File

@ -210,7 +210,7 @@ int __init fastlane_esp_detect(struct scsi_host_template *tpnt)
esp->irq = IRQ_AMIGA_PORTS; esp->irq = IRQ_AMIGA_PORTS;
esp->slot = board+FASTLANE_ESP_ADDR; esp->slot = board+FASTLANE_ESP_ADDR;
if (request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ, if (request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,
"Fastlane SCSI", esp->ehost)) { "Fastlane SCSI", esp->ehost)) {
printk(KERN_WARNING "Fastlane: Could not get IRQ%d, aborting.\n", IRQ_AMIGA_PORTS); printk(KERN_WARNING "Fastlane: Could not get IRQ%d, aborting.\n", IRQ_AMIGA_PORTS);
goto err_unmap; goto err_unmap;

2
drivers/scsi/fd_mcs.c
View File

@ -400,7 +400,7 @@ static int fd_mcs_detect(struct scsi_host_template * tpnt)
mca_set_adapter_name(slot - 1, fd_mcs_adapters[loop].name); mca_set_adapter_name(slot - 1, fd_mcs_adapters[loop].name);
/* check irq/region */ /* check irq/region */
if (request_irq(irq, fd_mcs_intr, SA_SHIRQ, "fd_mcs", hosts)) { if (request_irq(irq, fd_mcs_intr, IRQF_SHARED, "fd_mcs", hosts)) {
printk(KERN_ERR "fd_mcs: interrupt is not available, skipping...\n"); printk(KERN_ERR "fd_mcs: interrupt is not available, skipping...\n");
continue; continue;
} }

2
drivers/scsi/fdomain.c
View File

@ -949,7 +949,7 @@ struct Scsi_Host *__fdomain_16x0_detect(struct scsi_host_template *tpnt )
/* Register the IRQ with the kernel */ /* Register the IRQ with the kernel */
retcode = request_irq( interrupt_level, retcode = request_irq( interrupt_level,
do_fdomain_16x0_intr, pdev?SA_SHIRQ:0, "fdomain", shpnt); do_fdomain_16x0_intr, pdev?IRQF_SHARED:0, "fdomain", shpnt);
if (retcode < 0) { if (retcode < 0) {
if (retcode == -EINVAL) { if (retcode == -EINVAL) {

2
drivers/scsi/g_NCR5380.c
View File

@ -461,7 +461,7 @@ int __init generic_NCR5380_detect(struct scsi_host_template * tpnt)
instance->irq = NCR5380_probe_irq(instance, 0xffff); instance->irq = NCR5380_probe_irq(instance, 0xffff);
if (instance->irq != SCSI_IRQ_NONE) if (instance->irq != SCSI_IRQ_NONE)
if (request_irq(instance->irq, generic_NCR5380_intr, SA_INTERRUPT, "NCR5380", instance)) { if (request_irq(instance->irq, generic_NCR5380_intr, IRQF_DISABLED, "NCR5380", instance)) {
printk(KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq); printk(KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq);
instance->irq = SCSI_IRQ_NONE; instance->irq = SCSI_IRQ_NONE;
} }

6
drivers/scsi/gdth.c
View File

@ -4350,7 +4350,7 @@ static int __init gdth_detect(Scsi_Host_Template *shtp)
printk("Configuring GDT-ISA HA at BIOS 0x%05X IRQ %u DRQ %u\n", printk("Configuring GDT-ISA HA at BIOS 0x%05X IRQ %u DRQ %u\n",
isa_bios,ha->irq,ha->drq); isa_bios,ha->irq,ha->drq);
if (request_irq(ha->irq,gdth_interrupt,SA_INTERRUPT,"gdth",ha)) { if (request_irq(ha->irq,gdth_interrupt,IRQF_DISABLED,"gdth",ha)) {
printk("GDT-ISA: Unable to allocate IRQ\n"); printk("GDT-ISA: Unable to allocate IRQ\n");
scsi_unregister(shp); scsi_unregister(shp);
continue; continue;
@ -4476,7 +4476,7 @@ static int __init gdth_detect(Scsi_Host_Template *shtp)
printk("Configuring GDT-EISA HA at Slot %d IRQ %u\n", printk("Configuring GDT-EISA HA at Slot %d IRQ %u\n",
eisa_slot>>12,ha->irq); eisa_slot>>12,ha->irq);
if (request_irq(ha->irq,gdth_interrupt,SA_INTERRUPT,"gdth",ha)) { if (request_irq(ha->irq,gdth_interrupt,IRQF_DISABLED,"gdth",ha)) {
printk("GDT-EISA: Unable to allocate IRQ\n"); printk("GDT-EISA: Unable to allocate IRQ\n");
scsi_unregister(shp); scsi_unregister(shp);
continue; continue;
@ -4603,7 +4603,7 @@ static int __init gdth_detect(Scsi_Host_Template *shtp)
pcistr[ctr].bus,PCI_SLOT(pcistr[ctr].device_fn),ha->irq); pcistr[ctr].bus,PCI_SLOT(pcistr[ctr].device_fn),ha->irq);
if (request_irq(ha->irq, gdth_interrupt, if (request_irq(ha->irq, gdth_interrupt,
SA_INTERRUPT|SA_SHIRQ, "gdth", ha)) IRQF_DISABLED|IRQF_SHARED, "gdth", ha))
{ {
printk("GDT-PCI: Unable to allocate IRQ\n"); printk("GDT-PCI: Unable to allocate IRQ\n");
scsi_unregister(shp); scsi_unregister(shp);

2
drivers/scsi/gvp11.c
View File

@ -328,7 +328,7 @@ int __init gvp11_detect(struct scsi_host_template *tpnt)
(epc & GVP_SCSICLKMASK) ? WD33C93_FS_8_10 (epc & GVP_SCSICLKMASK) ? WD33C93_FS_8_10
: WD33C93_FS_12_15); : WD33C93_FS_12_15);
request_irq(IRQ_AMIGA_PORTS, gvp11_intr, SA_SHIRQ, "GVP11 SCSI", request_irq(IRQ_AMIGA_PORTS, gvp11_intr, IRQF_SHARED, "GVP11 SCSI",
instance); instance);
DMA(instance)->CNTR = GVP11_DMAC_INT_ENABLE; DMA(instance)->CNTR = GVP11_DMAC_INT_ENABLE;
num_gvp11++; num_gvp11++;

2
drivers/scsi/hptiop.c
View File

@ -1304,7 +1304,7 @@ static int __devinit hptiop_probe(struct pci_dev *pcidev,
pci_set_drvdata(pcidev, host); pci_set_drvdata(pcidev, host);
if (request_irq(pcidev->irq, hptiop_intr, SA_SHIRQ, if (request_irq(pcidev->irq, hptiop_intr, IRQF_SHARED,
driver_name, hba)) { driver_name, hba)) {
printk(KERN_ERR "scsi%d: request irq %d failed\n", printk(KERN_ERR "scsi%d: request irq %d failed\n",
hba->host->host_no, pcidev->irq); hba->host->host_no, pcidev->irq);

6
drivers/scsi/ibmmca.c
View File

@ -1510,7 +1510,7 @@ int ibmmca_detect(struct scsi_host_template * scsi_template)
#endif #endif
/* get interrupt request level */ /* get interrupt request level */
if (request_irq(IM_IRQ, interrupt_handler, SA_SHIRQ, "ibmmcascsi", hosts)) { if (request_irq(IM_IRQ, interrupt_handler, IRQF_SHARED, "ibmmcascsi", hosts)) {
printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ); printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ);
return 0; return 0;
} else } else
@ -1635,7 +1635,7 @@ int ibmmca_detect(struct scsi_host_template * scsi_template)
/* IRQ11 is used by SCSI-2 F/W Adapter/A */ /* IRQ11 is used by SCSI-2 F/W Adapter/A */
printk(KERN_DEBUG "IBM MCA SCSI: SCSI-2 F/W adapter needs IRQ 11.\n"); printk(KERN_DEBUG "IBM MCA SCSI: SCSI-2 F/W adapter needs IRQ 11.\n");
/* get interrupt request level */ /* get interrupt request level */
if (request_irq(IM_IRQ_FW, interrupt_handler, SA_SHIRQ, "ibmmcascsi", hosts)) { if (request_irq(IM_IRQ_FW, interrupt_handler, IRQF_SHARED, "ibmmcascsi", hosts)) {
printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ_FW); printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ_FW);
} else } else
IRQ11_registered++; IRQ11_registered++;
@ -1696,7 +1696,7 @@ int ibmmca_detect(struct scsi_host_template * scsi_template)
/* IRQ11 is used by SCSI-2 F/W Adapter/A */ /* IRQ11 is used by SCSI-2 F/W Adapter/A */
printk(KERN_DEBUG "IBM MCA SCSI: SCSI-2 F/W adapter needs IRQ 11.\n"); printk(KERN_DEBUG "IBM MCA SCSI: SCSI-2 F/W adapter needs IRQ 11.\n");
/* get interrupt request level */ /* get interrupt request level */
if (request_irq(IM_IRQ_FW, interrupt_handler, SA_SHIRQ, "ibmmcascsi", hosts)) if (request_irq(IM_IRQ_FW, interrupt_handler, IRQF_SHARED, "ibmmcascsi", hosts))
printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ_FW); printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ_FW);
else else
IRQ11_registered++; IRQ11_registered++;

2
drivers/scsi/in2000.c
View File

@ -2015,7 +2015,7 @@ static int __init in2000_detect(struct scsi_host_template * tpnt)
write1_io(0, IO_FIFO_READ); /* start fifo out in read mode */ write1_io(0, IO_FIFO_READ); /* start fifo out in read mode */
write1_io(0, IO_INTR_MASK); /* allow all ints */ write1_io(0, IO_INTR_MASK); /* allow all ints */
x = int_tab[(switches & (SW_INT0 | SW_INT1)) >> SW_INT_SHIFT]; x = int_tab[(switches & (SW_INT0 | SW_INT1)) >> SW_INT_SHIFT];
if (request_irq(x, in2000_intr, SA_INTERRUPT, "in2000", instance)) { if (request_irq(x, in2000_intr, IRQF_DISABLED, "in2000", instance)) {
printk("in2000_detect: Unable to allocate IRQ.\n"); printk("in2000_detect: Unable to allocate IRQ.\n");
detect_count--; detect_count--;
continue; continue;

2
drivers/scsi/initio.c
View File

@ -2867,7 +2867,7 @@ static int i91u_detect(struct scsi_host_template * tpnt)
hreg->sg_tablesize = TOTAL_SG_ENTRY; /* Maximun support is 32 */ hreg->sg_tablesize = TOTAL_SG_ENTRY; /* Maximun support is 32 */
/* Initial tulip chip */ /* Initial tulip chip */
ok = request_irq(pHCB->HCS_Intr, i91u_intr, SA_INTERRUPT | SA_SHIRQ, "i91u", hreg); ok = request_irq(pHCB->HCS_Intr, i91u_intr, IRQF_DISABLED | IRQF_SHARED, "i91u", hreg);
if (ok < 0) { if (ok < 0) {
printk(KERN_WARNING "i91u: unable to request IRQ %d\n\n", pHCB->HCS_Intr); printk(KERN_WARNING "i91u: unable to request IRQ %d\n\n", pHCB->HCS_Intr);
return 0; return 0;

2
drivers/scsi/ipr.c
View File

@ -6428,7 +6428,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
ioa_cfg->needs_hard_reset = 1; ioa_cfg->needs_hard_reset = 1;
ipr_mask_and_clear_interrupts(ioa_cfg, ~IPR_PCII_IOA_TRANS_TO_OPER); ipr_mask_and_clear_interrupts(ioa_cfg, ~IPR_PCII_IOA_TRANS_TO_OPER);
rc = request_irq(pdev->irq, ipr_isr, SA_SHIRQ, IPR_NAME, ioa_cfg); rc = request_irq(pdev->irq, ipr_isr, IRQF_SHARED, IPR_NAME, ioa_cfg);
if (rc) { if (rc) {
dev_err(&pdev->dev, "Couldn't register IRQ %d! rc=%d\n", dev_err(&pdev->dev, "Couldn't register IRQ %d! rc=%d\n",

4
drivers/scsi/ips.c
View File

@ -7007,7 +7007,7 @@ ips_register_scsi(int index)
memcpy(ha, oldha, sizeof (ips_ha_t)); memcpy(ha, oldha, sizeof (ips_ha_t));
free_irq(oldha->irq, oldha); free_irq(oldha->irq, oldha);
/* Install the interrupt handler with the new ha */ /* Install the interrupt handler with the new ha */
if (request_irq(ha->irq, do_ipsintr, SA_SHIRQ, ips_name, ha)) { if (request_irq(ha->irq, do_ipsintr, IRQF_SHARED, ips_name, ha)) {
IPS_PRINTK(KERN_WARNING, ha->pcidev, IPS_PRINTK(KERN_WARNING, ha->pcidev,
"Unable to install interrupt handler\n"); "Unable to install interrupt handler\n");
scsi_host_put(sh); scsi_host_put(sh);
@ -7419,7 +7419,7 @@ ips_init_phase2(int index)
} }
/* Install the interrupt handler */ /* Install the interrupt handler */
if (request_irq(ha->irq, do_ipsintr, SA_SHIRQ, ips_name, ha)) { if (request_irq(ha->irq, do_ipsintr, IRQF_SHARED, ips_name, ha)) {
IPS_PRINTK(KERN_WARNING, ha->pcidev, IPS_PRINTK(KERN_WARNING, ha->pcidev,
"Unable to install interrupt handler\n"); "Unable to install interrupt handler\n");
return ips_abort_init(ha, index); return ips_abort_init(ha, index);

2
drivers/scsi/jazz_esp.c
View File

@ -131,7 +131,7 @@ static int jazz_esp_detect(struct scsi_host_template *tpnt)
esp->esp_command_dvma = vdma_alloc(CPHYSADDR(cmd_buffer), sizeof (cmd_buffer)); esp->esp_command_dvma = vdma_alloc(CPHYSADDR(cmd_buffer), sizeof (cmd_buffer));
esp->irq = JAZZ_SCSI_IRQ; esp->irq = JAZZ_SCSI_IRQ;
request_irq(JAZZ_SCSI_IRQ, esp_intr, SA_INTERRUPT, "JAZZ SCSI", request_irq(JAZZ_SCSI_IRQ, esp_intr, IRQF_DISABLED, "JAZZ SCSI",
esp->ehost); esp->ehost);
/* /*

2
drivers/scsi/lasi700.c
View File

@ -131,7 +131,7 @@ lasi700_probe(struct parisc_device *dev)
host->this_id = 7; host->this_id = 7;
host->base = base; host->base = base;
host->irq = dev->irq; host->irq = dev->irq;
if(request_irq(dev->irq, NCR_700_intr, SA_SHIRQ, "lasi700", host)) { if(request_irq(dev->irq, NCR_700_intr, IRQF_SHARED, "lasi700", host)) {
printk(KERN_ERR "lasi700: request_irq failed!\n"); printk(KERN_ERR "lasi700: request_irq failed!\n");
goto out_put_host; goto out_put_host;
} }

2
drivers/scsi/libata-bmdma.c
View File

@ -853,7 +853,7 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int
return NULL; return NULL;
probe_ent->irq = pdev->irq; probe_ent->irq = pdev->irq;
probe_ent->irq_flags = SA_SHIRQ; probe_ent->irq_flags = IRQF_SHARED;
probe_ent->private_data = port[0]->private_data; probe_ent->private_data = port[0]->private_data;
if (ports & ATA_PORT_PRIMARY) { if (ports & ATA_PORT_PRIMARY) {

2
drivers/scsi/lpfc/lpfc_init.c
View File

@ -1620,7 +1620,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
if (error) if (error)
goto out_remove_host; goto out_remove_host;
error = request_irq(phba->pcidev->irq, lpfc_intr_handler, SA_SHIRQ, error = request_irq(phba->pcidev->irq, lpfc_intr_handler, IRQF_SHARED,
LPFC_DRIVER_NAME, phba); LPFC_DRIVER_NAME, phba);
if (error) { if (error) {
lpfc_printf_log(phba, KERN_ERR, LOG_INIT, lpfc_printf_log(phba, KERN_ERR, LOG_INIT,

2
drivers/scsi/megaraid.c
View File

@ -4714,7 +4714,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
if (request_irq(irq, (adapter->flag & BOARD_MEMMAP) ? if (request_irq(irq, (adapter->flag & BOARD_MEMMAP) ?
megaraid_isr_memmapped : megaraid_isr_iomapped, megaraid_isr_memmapped : megaraid_isr_iomapped,
SA_SHIRQ, "megaraid", adapter)) { IRQF_SHARED, "megaraid", adapter)) {
printk(KERN_WARNING printk(KERN_WARNING
"megaraid: Couldn't register IRQ %d!\n", irq); "megaraid: Couldn't register IRQ %d!\n", irq);
goto out_free_scb_list; goto out_free_scb_list;

2
drivers/scsi/megaraid/megaraid_mbox.c
View File

@ -767,7 +767,7 @@ megaraid_init_mbox(adapter_t *adapter)
// //
// request IRQ and register the interrupt service routine // request IRQ and register the interrupt service routine
if (request_irq(adapter->irq, megaraid_isr, SA_SHIRQ, "megaraid", if (request_irq(adapter->irq, megaraid_isr, IRQF_SHARED, "megaraid",
adapter)) { adapter)) {
con_log(CL_ANN, (KERN_WARNING con_log(CL_ANN, (KERN_WARNING

2
drivers/scsi/megaraid/megaraid_sas.c
View File

@ -2191,7 +2191,7 @@ megasas_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
/* /*
* Register IRQ * Register IRQ
*/ */
if (request_irq(pdev->irq, megasas_isr, SA_SHIRQ, "megasas", instance)) { if (request_irq(pdev->irq, megasas_isr, IRQF_SHARED, "megasas", instance)) {
printk(KERN_DEBUG "megasas: Failed to register IRQ\n"); printk(KERN_DEBUG "megasas: Failed to register IRQ\n");
goto fail_irq; goto fail_irq;
} }

2
drivers/scsi/nsp32.c
View File

@ -2867,7 +2867,7 @@ static int nsp32_detect(struct scsi_host_template *sht)
nsp32_do_bus_reset(data); nsp32_do_bus_reset(data);
ret = request_irq(host->irq, do_nsp32_isr, ret = request_irq(host->irq, do_nsp32_isr,
SA_SHIRQ | SA_SAMPLE_RANDOM, "nsp32", data); IRQF_SHARED | IRQF_SAMPLE_RANDOM, "nsp32", data);
if (ret < 0) { if (ret < 0) {
nsp32_msg(KERN_ERR, "Unable to allocate IRQ for NinjaSCSI32 " nsp32_msg(KERN_ERR, "Unable to allocate IRQ for NinjaSCSI32 "
"SCSI PCI controller. Interrupt: %d", host->irq); "SCSI PCI controller. Interrupt: %d", host->irq);

2
drivers/scsi/oktagon_esp.c
View File

@ -197,7 +197,7 @@ int oktagon_esp_detect(struct scsi_host_template *tpnt)
esp->esp_command_dvma = (__u32) cmd_buffer; esp->esp_command_dvma = (__u32) cmd_buffer;
esp->irq = IRQ_AMIGA_PORTS; esp->irq = IRQ_AMIGA_PORTS;
request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ, request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,
"BSC Oktagon SCSI", esp->ehost); "BSC Oktagon SCSI", esp->ehost);
/* Figure out our scsi ID on the bus */ /* Figure out our scsi ID on the bus */

2
drivers/scsi/pas16.c
View File

@ -454,7 +454,7 @@ int __init pas16_detect(struct scsi_host_template * tpnt)
instance->irq = NCR5380_probe_irq(instance, PAS16_IRQS); instance->irq = NCR5380_probe_irq(instance, PAS16_IRQS);
if (instance->irq != SCSI_IRQ_NONE) if (instance->irq != SCSI_IRQ_NONE)
if (request_irq(instance->irq, pas16_intr, SA_INTERRUPT, "pas16", instance)) { if (request_irq(instance->irq, pas16_intr, IRQF_DISABLED, "pas16", instance)) {
printk("scsi%d : IRQ%d not free, interrupts disabled\n", printk("scsi%d : IRQ%d not free, interrupts disabled\n",
instance->host_no, instance->irq); instance->host_no, instance->irq);
instance->irq = SCSI_IRQ_NONE; instance->irq = SCSI_IRQ_NONE;

2
drivers/scsi/pcmcia/nsp_cs.c
View File

@ -1623,7 +1623,7 @@ static int nsp_cs_probe(struct pcmcia_device *link)
/* Interrupt handler */ /* Interrupt handler */
link->irq.Handler = &nspintr; link->irq.Handler = &nspintr;
link->irq.Instance = info; link->irq.Instance = info;
link->irq.Attributes |= (SA_SHIRQ | SA_SAMPLE_RANDOM); link->irq.Attributes |= (IRQF_SHARED | IRQF_SAMPLE_RANDOM);
/* General socket configuration */ /* General socket configuration */
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;

2
drivers/scsi/pcmcia/sym53c500_cs.c
View File

@ -799,7 +799,7 @@ next_entry:
data = (struct sym53c500_data *)host->hostdata; data = (struct sym53c500_data *)host->hostdata;
if (irq_level > 0) { if (irq_level > 0) {
if (request_irq(irq_level, SYM53C500_intr, SA_SHIRQ, "SYM53C500", host)) { if (request_irq(irq_level, SYM53C500_intr, IRQF_SHARED, "SYM53C500", host)) {
printk("SYM53C500: unable to allocate IRQ %d\n", irq_level); printk("SYM53C500: unable to allocate IRQ %d\n", irq_level);
goto err_free_scsi; goto err_free_scsi;
} }

2
drivers/scsi/pdc_adma.c
View File

@ -690,7 +690,7 @@ static int adma_ata_init_one(struct pci_dev *pdev,
probe_ent->port_ops = adma_port_info[board_idx].port_ops; probe_ent->port_ops = adma_port_info[board_idx].port_ops;
probe_ent->irq = pdev->irq; probe_ent->irq = pdev->irq;
probe_ent->irq_flags = SA_SHIRQ; probe_ent->irq_flags = IRQF_SHARED;
probe_ent->mmio_base = mmio_base; probe_ent->mmio_base = mmio_base;
probe_ent->n_ports = ADMA_PORTS; probe_ent->n_ports = ADMA_PORTS;

4
drivers/scsi/qla1280.c
View File

@ -192,7 +192,7 @@
- Don't walk the entire list in qla1280_putq_t() just to directly - Don't walk the entire list in qla1280_putq_t() just to directly
grab the pointer to the last element afterwards grab the pointer to the last element afterwards
Rev 3.23.5 Beta August 9, 2001, Jes Sorensen Rev 3.23.5 Beta August 9, 2001, Jes Sorensen
- Don't use SA_INTERRUPT, it's use is deprecated for this kinda driver - Don't use IRQF_DISABLED, it's use is deprecated for this kinda driver
Rev 3.23.4 Beta August 8, 2001, Jes Sorensen Rev 3.23.4 Beta August 8, 2001, Jes Sorensen
- Set dev->max_sectors to 1024 - Set dev->max_sectors to 1024
Rev 3.23.3 Beta August 6, 2001, Jes Sorensen Rev 3.23.3 Beta August 6, 2001, Jes Sorensen
@ -4369,7 +4369,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
/* Disable ISP interrupts. */ /* Disable ISP interrupts. */
qla1280_disable_intrs(ha); qla1280_disable_intrs(ha);
if (request_irq(pdev->irq, qla1280_intr_handler, SA_SHIRQ, if (request_irq(pdev->irq, qla1280_intr_handler, IRQF_SHARED,
"qla1280", ha)) { "qla1280", ha)) {
printk("qla1280 : Failed to reserve interrupt %d already " printk("qla1280 : Failed to reserve interrupt %d already "
"in use\n", pdev->irq); "in use\n", pdev->irq);

2
drivers/scsi/qla2xxx/qla_os.c
View File

@ -1541,7 +1541,7 @@ static int qla2x00_probe_one(struct pci_dev *pdev)
host->transportt = qla2xxx_transport_template; host->transportt = qla2xxx_transport_template;
ret = request_irq(pdev->irq, ha->isp_ops.intr_handler, ret = request_irq(pdev->irq, ha->isp_ops.intr_handler,
SA_INTERRUPT|SA_SHIRQ, QLA2XXX_DRIVER_NAME, ha); IRQF_DISABLED|IRQF_SHARED, QLA2XXX_DRIVER_NAME, ha);
if (ret) { if (ret) {
qla_printk(KERN_WARNING, ha, qla_printk(KERN_WARNING, ha,
"Failed to reserve interrupt %d already in use.\n", "Failed to reserve interrupt %d already in use.\n",

2
drivers/scsi/qlogicpti.c
View File

@ -718,7 +718,7 @@ static int __init qpti_register_irq(struct qlogicpti *qpti)
* sanely maintain. * sanely maintain.
*/ */
if (request_irq(qpti->irq, qpti_intr, if (request_irq(qpti->irq, qpti_intr,
SA_SHIRQ, "Qlogic/PTI", qpti)) IRQF_SHARED, "Qlogic/PTI", qpti))
goto fail; goto fail;
printk("qpti%d: IRQ %d ", qpti->qpti_id, qpti->irq); printk("qpti%d: IRQ %d ", qpti->qpti_id, qpti->irq);

2
drivers/scsi/sata_mv.c
View File

@ -2395,7 +2395,7 @@ static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
probe_ent->port_ops = mv_port_info[board_idx].port_ops; probe_ent->port_ops = mv_port_info[board_idx].port_ops;
probe_ent->irq = pdev->irq; probe_ent->irq = pdev->irq;
probe_ent->irq_flags = SA_SHIRQ; probe_ent->irq_flags = IRQF_SHARED;
probe_ent->mmio_base = mmio_base; probe_ent->mmio_base = mmio_base;
probe_ent->private_data = hpriv; probe_ent->private_data = hpriv;

2
drivers/scsi/sata_promise.c
View File

@ -743,7 +743,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
probe_ent->port_ops = pdc_port_info[board_idx].port_ops; probe_ent->port_ops = pdc_port_info[board_idx].port_ops;
probe_ent->irq = pdev->irq; probe_ent->irq = pdev->irq;
probe_ent->irq_flags = SA_SHIRQ; probe_ent->irq_flags = IRQF_SHARED;
probe_ent->mmio_base = mmio_base; probe_ent->mmio_base = mmio_base;
pdc_ata_setup_port(&probe_ent->port[0], base + 0x200); pdc_ata_setup_port(&probe_ent->port[0], base + 0x200);

2
drivers/scsi/sata_qstor.c
View File

@ -680,7 +680,7 @@ static int qs_ata_init_one(struct pci_dev *pdev,
probe_ent->port_ops = qs_port_info[board_idx].port_ops; probe_ent->port_ops = qs_port_info[board_idx].port_ops;
probe_ent->irq = pdev->irq; probe_ent->irq = pdev->irq;
probe_ent->irq_flags = SA_SHIRQ; probe_ent->irq_flags = IRQF_SHARED;
probe_ent->mmio_base = mmio_base; probe_ent->mmio_base = mmio_base;
probe_ent->n_ports = QS_PORTS; probe_ent->n_ports = QS_PORTS;

2
drivers/scsi/sata_sil.c
View File

@ -608,7 +608,7 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
probe_ent->mwdma_mask = sil_port_info[ent->driver_data].mwdma_mask; probe_ent->mwdma_mask = sil_port_info[ent->driver_data].mwdma_mask;
probe_ent->udma_mask = sil_port_info[ent->driver_data].udma_mask; probe_ent->udma_mask = sil_port_info[ent->driver_data].udma_mask;
probe_ent->irq = pdev->irq; probe_ent->irq = pdev->irq;
probe_ent->irq_flags = SA_SHIRQ; probe_ent->irq_flags = IRQF_SHARED;
probe_ent->host_flags = sil_port_info[ent->driver_data].host_flags; probe_ent->host_flags = sil_port_info[ent->driver_data].host_flags;
mmio_base = pci_iomap(pdev, 5, 0); mmio_base = pci_iomap(pdev, 5, 0);

2
drivers/scsi/sata_sil24.c
View File

@ -1041,7 +1041,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
probe_ent->n_ports = SIL24_FLAG2NPORTS(pinfo->host_flags); probe_ent->n_ports = SIL24_FLAG2NPORTS(pinfo->host_flags);
probe_ent->irq = pdev->irq; probe_ent->irq = pdev->irq;
probe_ent->irq_flags = SA_SHIRQ; probe_ent->irq_flags = IRQF_SHARED;
probe_ent->mmio_base = port_base; probe_ent->mmio_base = port_base;
probe_ent->private_data = hpriv; probe_ent->private_data = hpriv;

2
drivers/scsi/sata_svw.c
View File

@ -428,7 +428,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
probe_ent->port_ops = &k2_sata_ops; probe_ent->port_ops = &k2_sata_ops;
probe_ent->n_ports = 4; probe_ent->n_ports = 4;
probe_ent->irq = pdev->irq; probe_ent->irq = pdev->irq;
probe_ent->irq_flags = SA_SHIRQ; probe_ent->irq_flags = IRQF_SHARED;
probe_ent->mmio_base = mmio_base; probe_ent->mmio_base = mmio_base;
/* We don't care much about the PIO/UDMA masks, but the core won't like us /* We don't care much about the PIO/UDMA masks, but the core won't like us

2
drivers/scsi/sata_sx4.c
View File

@ -1436,7 +1436,7 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *
probe_ent->port_ops = pdc_port_info[board_idx].port_ops; probe_ent->port_ops = pdc_port_info[board_idx].port_ops;
probe_ent->irq = pdev->irq; probe_ent->irq = pdev->irq;
probe_ent->irq_flags = SA_SHIRQ; probe_ent->irq_flags = IRQF_SHARED;
probe_ent->mmio_base = mmio_base; probe_ent->mmio_base = mmio_base;
probe_ent->private_data = hpriv; probe_ent->private_data = hpriv;

2
drivers/scsi/sata_via.c
View File

@ -242,7 +242,7 @@ static struct ata_probe_ent *vt6421_init_probe_ent(struct pci_dev *pdev)
probe_ent->port_ops = &svia_sata_ops; probe_ent->port_ops = &svia_sata_ops;
probe_ent->n_ports = N_PORTS; probe_ent->n_ports = N_PORTS;
probe_ent->irq = pdev->irq; probe_ent->irq = pdev->irq;
probe_ent->irq_flags = SA_SHIRQ; probe_ent->irq_flags = IRQF_SHARED;
probe_ent->pio_mask = 0x1f; probe_ent->pio_mask = 0x1f;
probe_ent->mwdma_mask = 0x07; probe_ent->mwdma_mask = 0x07;
probe_ent->udma_mask = 0x7f; probe_ent->udma_mask = 0x7f;

2
drivers/scsi/sata_vsc.c
View File

@ -400,7 +400,7 @@ static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_d
probe_ent->port_ops = &vsc_sata_ops; probe_ent->port_ops = &vsc_sata_ops;
probe_ent->n_ports = 4; probe_ent->n_ports = 4;
probe_ent->irq = pdev->irq; probe_ent->irq = pdev->irq;
probe_ent->irq_flags = SA_SHIRQ; probe_ent->irq_flags = IRQF_SHARED;
probe_ent->mmio_base = mmio_base; probe_ent->mmio_base = mmio_base;
/* We don't care much about the PIO/UDMA masks, but the core won't like us /* We don't care much about the PIO/UDMA masks, but the core won't like us

2
drivers/scsi/seagate.c
View File

@ -497,7 +497,7 @@ int __init seagate_st0x_detect (struct scsi_host_template * tpnt)
return 0; return 0;
hostno = instance->host_no; hostno = instance->host_no;
if (request_irq (irq, do_seagate_reconnect_intr, SA_INTERRUPT, (controller_type == SEAGATE) ? "seagate" : "tmc-8xx", instance)) { if (request_irq (irq, do_seagate_reconnect_intr, IRQF_DISABLED, (controller_type == SEAGATE) ? "seagate" : "tmc-8xx", instance)) {
printk(KERN_ERR "scsi%d : unable to allocate IRQ%d\n", hostno, irq); printk(KERN_ERR "scsi%d : unable to allocate IRQ%d\n", hostno, irq);
return 0; return 0;
} }

2
drivers/scsi/sim710.c
View File

@ -133,7 +133,7 @@ sim710_probe_common(struct device *dev, unsigned long base_addr,
host->this_id = scsi_id; host->this_id = scsi_id;
host->base = base_addr; host->base = base_addr;
host->irq = irq; host->irq = irq;
if (request_irq(irq, NCR_700_intr, SA_SHIRQ, "sim710", host)) { if (request_irq(irq, NCR_700_intr, IRQF_SHARED, "sim710", host)) {
printk(KERN_ERR "sim710: request_irq failed\n"); printk(KERN_ERR "sim710: request_irq failed\n");
goto out_put_host; goto out_put_host;
} }

2
drivers/scsi/sun3x_esp.c
View File

@ -97,7 +97,7 @@ int sun3x_esp_detect(struct scsi_host_template *tpnt)
esp->esp_command_dvma = dvma_vtob((unsigned long)esp->esp_command); esp->esp_command_dvma = dvma_vtob((unsigned long)esp->esp_command);
esp->irq = 2; esp->irq = 2;
if (request_irq(esp->irq, esp_intr, SA_INTERRUPT, if (request_irq(esp->irq, esp_intr, IRQF_DISABLED,
"SUN3X SCSI", esp->ehost)) { "SUN3X SCSI", esp->ehost)) {
esp_deallocate(esp); esp_deallocate(esp);
return 0; return 0;

2
drivers/scsi/sym53c8xx_2/sym_glue.c
View File

@ -1547,7 +1547,7 @@ static struct Scsi_Host * __devinit sym_attach(struct scsi_host_template *tpnt,
* If we synchonize the C code with SCRIPTS on interrupt, * If we synchonize the C code with SCRIPTS on interrupt,
* we do not want to share the INTR line at all. * we do not want to share the INTR line at all.
*/ */
if (request_irq(pdev->irq, sym53c8xx_intr, SA_SHIRQ, NAME53C8XX, np)) { if (request_irq(pdev->irq, sym53c8xx_intr, IRQF_SHARED, NAME53C8XX, np)) {
printf_err("%s: request irq %d failure\n", printf_err("%s: request irq %d failure\n",
sym_name(np), pdev->irq); sym_name(np), pdev->irq);
goto attach_failed; goto attach_failed;

2
drivers/scsi/t128.c
View File

@ -260,7 +260,7 @@ found:
instance->irq = NCR5380_probe_irq(instance, T128_IRQS); instance->irq = NCR5380_probe_irq(instance, T128_IRQS);
if (instance->irq != SCSI_IRQ_NONE) if (instance->irq != SCSI_IRQ_NONE)
if (request_irq(instance->irq, t128_intr, SA_INTERRUPT, "t128", instance)) { if (request_irq(instance->irq, t128_intr, IRQF_DISABLED, "t128", instance)) {
printk("scsi%d : IRQ%d not free, interrupts disabled\n", printk("scsi%d : IRQ%d not free, interrupts disabled\n",
instance->host_no, instance->irq); instance->host_no, instance->irq);
instance->irq = SCSI_IRQ_NONE; instance->irq = SCSI_IRQ_NONE;

2
drivers/scsi/tmscsim.c
View File

@ -2584,7 +2584,7 @@ static int __devinit dc390_probe_one(struct pci_dev *pdev,
/* Reset Pending INT */ /* Reset Pending INT */
DC390_read8_(INT_Status, io_port); DC390_read8_(INT_Status, io_port);
if (request_irq(pdev->irq, do_DC390_Interrupt, SA_SHIRQ, if (request_irq(pdev->irq, do_DC390_Interrupt, IRQF_SHARED,
"tmscsim", pACB)) { "tmscsim", pACB)) {
printk(KERN_ERR "DC390: register IRQ error!\n"); printk(KERN_ERR "DC390: register IRQ error!\n");
goto out_release_region; goto out_release_region;

2
drivers/scsi/u14-34f.c
View File

@ -872,7 +872,7 @@ static int port_detect \
/* Board detected, allocate its IRQ */ /* Board detected, allocate its IRQ */
if (request_irq(irq, do_interrupt_handler, if (request_irq(irq, do_interrupt_handler,
SA_INTERRUPT | ((subversion == ESA) ? SA_SHIRQ : 0), IRQF_DISABLED | ((subversion == ESA) ? IRQF_SHARED : 0),
driver_name, (void *) &sha[j])) { driver_name, (void *) &sha[j])) {
printk("%s: unable to allocate IRQ %u, detaching.\n", name, irq); printk("%s: unable to allocate IRQ %u, detaching.\n", name, irq);
goto freelock; goto freelock;

2
drivers/scsi/wd7000.c
View File

@ -1250,7 +1250,7 @@ static int wd7000_init(Adapter * host)
return 0; return 0;
if (request_irq(host->irq, wd7000_intr, SA_INTERRUPT, "wd7000", host)) { if (request_irq(host->irq, wd7000_intr, IRQF_DISABLED, "wd7000", host)) {
printk("wd7000_init: can't get IRQ %d.\n", host->irq); printk("wd7000_init: can't get IRQ %d.\n", host->irq);
return (0); return (0);
} }

2
drivers/scsi/zalon.c
View File

@ -136,7 +136,7 @@ zalon_probe(struct parisc_device *dev)
if (!host) if (!host)
goto fail; goto fail;
if (request_irq(dev->irq, ncr53c8xx_intr, SA_SHIRQ, "zalon", host)) { if (request_irq(dev->irq, ncr53c8xx_intr, IRQF_SHARED, "zalon", host)) {
printk(KERN_ERR "%s: irq problem with %d, detaching\n ", printk(KERN_ERR "%s: irq problem with %d, detaching\n ",
dev->dev.bus_id, dev->irq); dev->dev.bus_id, dev->irq);
goto fail; goto fail;