diff mbox series

[GIT,PULL] SCSI fixes for 5.8-rc5

Message ID 1595091880.3281.5.camel@HansenPartnership.com (mailing list archive)
State Superseded
Headers show
Series [GIT,PULL] SCSI fixes for 5.8-rc5 | expand

Commit Message

James Bottomley July 18, 2020, 5:04 p.m. UTC
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.

The patch is available here:

git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes

The short changelog is:

Chandrakanth Patil (1):
      scsi: megaraid_sas: Remove undefined ENABLE_IRQ_POLL macro

And the diffstat:

 drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 --
 1 file changed, 2 deletions(-)

With full diff below

James

---

Comments

pr-tracker-bot@kernel.org July 18, 2020, 8:50 p.m. UTC | #1
The pull request you sent on Sat, 18 Jul 2020 10:04:40 -0700:

> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f932d58abc38c898d7d3fe635ecb2b821a256f54

Thank you!
diff mbox series

Patch

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 319f241da4b6..fcf03f733e41 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);