diff options
Diffstat (limited to 'drivers/scsi/advansys.c')
-rw-r--r-- | drivers/scsi/advansys.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 537136457ea0..e32b4ab2f8fb 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c | |||
@@ -371,7 +371,7 @@ | |||
371 | 371 | ||
372 | 1.5 (8/8/96): | 372 | 1.5 (8/8/96): |
373 | 1. Add support for ABP-940U (PCI Ultra) adapter. | 373 | 1. Add support for ABP-940U (PCI Ultra) adapter. |
374 | 2. Add support for IRQ sharing by setting the SA_SHIRQ flag for | 374 | 2. Add support for IRQ sharing by setting the IRQF_SHARED flag for |
375 | request_irq and supplying a dev_id pointer to both request_irq() | 375 | request_irq and supplying a dev_id pointer to both request_irq() |
376 | and free_irq(). | 376 | and free_irq(). |
377 | 3. In AscSearchIOPortAddr11() restore a call to check_region() which | 377 | 3. In AscSearchIOPortAddr11() restore a call to check_region() which |
@@ -504,9 +504,9 @@ | |||
504 | 3. For v2.1.93 and newer kernels use CONFIG_PCI and new PCI BIOS | 504 | 3. For v2.1.93 and newer kernels use CONFIG_PCI and new PCI BIOS |
505 | access functions. | 505 | access functions. |
506 | 4. Update board serial number printing. | 506 | 4. Update board serial number printing. |
507 | 5. Try allocating an IRQ both with and without the SA_INTERRUPT | 507 | 5. Try allocating an IRQ both with and without the IRQF_DISABLED |
508 | flag set to allow IRQ sharing with drivers that do not set | 508 | flag set to allow IRQ sharing with drivers that do not set |
509 | the SA_INTERRUPT flag. Also display a more descriptive error | 509 | the IRQF_DISABLED flag. Also display a more descriptive error |
510 | message if request_irq() fails. | 510 | message if request_irq() fails. |
511 | 6. Update to latest Asc and Adv Libraries. | 511 | 6. Update to latest Asc and Adv Libraries. |
512 | 512 | ||
@@ -5202,19 +5202,19 @@ advansys_detect(struct scsi_host_template *tpnt) | |||
5202 | /* Register IRQ Number. */ | 5202 | /* Register IRQ Number. */ |
5203 | ASC_DBG1(2, "advansys_detect: request_irq() %d\n", shp->irq); | 5203 | ASC_DBG1(2, "advansys_detect: request_irq() %d\n", shp->irq); |
5204 | /* | 5204 | /* |
5205 | * If request_irq() fails with the SA_INTERRUPT flag set, | 5205 | * If request_irq() fails with the IRQF_DISABLED flag set, |
5206 | * then try again without the SA_INTERRUPT flag set. This | 5206 | * then try again without the IRQF_DISABLED flag set. This |
5207 | * allows IRQ sharing to work even with other drivers that | 5207 | * allows IRQ sharing to work even with other drivers that |
5208 | * do not set the SA_INTERRUPT flag. | 5208 | * do not set the IRQF_DISABLED flag. |
5209 | * | 5209 | * |
5210 | * If SA_INTERRUPT is not set, then interrupts are enabled | 5210 | * If IRQF_DISABLED is not set, then interrupts are enabled |
5211 | * before the driver interrupt function is called. | 5211 | * before the driver interrupt function is called. |
5212 | */ | 5212 | */ |
5213 | if (((ret = request_irq(shp->irq, advansys_interrupt, | 5213 | if (((ret = request_irq(shp->irq, advansys_interrupt, |
5214 | SA_INTERRUPT | (share_irq == TRUE ? SA_SHIRQ : 0), | 5214 | IRQF_DISABLED | (share_irq == TRUE ? IRQF_SHARED : 0), |
5215 | "advansys", boardp)) != 0) && | 5215 | "advansys", boardp)) != 0) && |
5216 | ((ret = request_irq(shp->irq, advansys_interrupt, | 5216 | ((ret = request_irq(shp->irq, advansys_interrupt, |
5217 | (share_irq == TRUE ? SA_SHIRQ : 0), | 5217 | (share_irq == TRUE ? IRQF_SHARED : 0), |
5218 | "advansys", boardp)) != 0)) | 5218 | "advansys", boardp)) != 0)) |
5219 | { | 5219 | { |
5220 | if (ret == -EBUSY) { | 5220 | if (ret == -EBUSY) { |