diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-18 13:22:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-18 13:22:03 -0700 |
| commit | f932d58abc38c898d7d3fe635ecb2b821a256f54 (patch) | |
| tree | fe3bd0239cf3691c9572f0954e11886ebdaec8d8 | |
| parent | e26aeee89f54e2e5867836231b4dc6448e45248b (diff) | |
| parent | 07d3f04550023395bbf34b99ec7e00fc50d9859f (diff) | |
| download | mvebu-f932d58abc38c898d7d3fe635ecb2b821a256f54.tar.gz | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi into master
Pull SCSI fix from James Bottomley:
"One small driver fix. Although the one liner makes it sound like a
cosmetic change, it's a regression fix for the megaraid_sas driver"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: megaraid_sas: Remove undefined ENABLE_IRQ_POLL macro
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index 319f241da4b66e..fcf03f733e4172 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -3739,10 +3739,8 @@ static irqreturn_t megasas_isr_fusion(int irq, void *devp) if (instance->mask_interrupts) return IRQ_NONE; -#if defined(ENABLE_IRQ_POLL) if (irq_context->irq_poll_scheduled) return IRQ_HANDLED; -#endif if (!instance->msix_vectors) { mfiStatus = instance->instancet->clear_intr(instance); |