]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
scsi: megaraid_sas: Remove undefined ENABLE_IRQ_POLL macro
authorChandrakanth Patil <chandrakanth.patil@broadcom.com>
Wed, 15 Jul 2020 12:01:53 +0000 (17:31 +0530)
committerKhalid Elmously <khalid.elmously@canonical.com>
Sat, 8 Aug 2020 05:53:12 +0000 (01:53 -0400)
BugLink: https://bugs.launchpad.net/bugs/1888560
commit 07d3f04550023395bbf34b99ec7e00fc50d9859f upstream.

As the ENABLE_IRQ_POLL macro is undefined, the check for ENABLE_IRQ_POLL
macro in ISR will always be false. This leads to irq polling being
non-functional.

Remove ENABLE_IRQ_POLL check from ISR.

Link: https://lore.kernel.org/r/20200715120153.20512-1-chandrakanth.patil@broadcom.com
Fixes: a6ffd5bf6819 ("scsi: megaraid_sas: Call disable_irq from process IRQ")
Cc: <stable@vger.kernel.org> # v5.3+
Signed-off-by: Chandrakanth Patil <chandrakanth.patil@broadcom.com>
Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
drivers/scsi/megaraid/megaraid_sas_fusion.c

index 03a6c86475c84c3aae6731074b805fc596454a1a..9a9d742779f6864dedf95a5735e87906becf8f2c 100644 (file)
@@ -3797,10 +3797,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);