Skip to content

Commit

Permalink
PCI: pciehp: Remove unnecessary guard
Browse files Browse the repository at this point in the history
In pcie_isr(), we return early if no status bits other than
PCI_EXP_SLTSTA_CC are set.  This was introduced by dbd79ae ("pciehp:
fix NULL dereference in interrupt handler"), but it is no longer necessary
because all the subsequent pcie_isr() code is already predicated on a
status bit being set.

Remove the unnecessary test for ~PCI_EXP_SLTSTA_CC.  No functional change
intended.

Tested-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
  • Loading branch information
Bjorn Helgaas committed Sep 14, 2016
1 parent 69bd3c5 commit 4947793
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions drivers/pci/hotplug/pciehp_hpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -590,9 +590,6 @@ static irqreturn_t pciehp_isr(int irq, void *dev_id)
}
}

if (!(events & ~PCI_EXP_SLTSTA_CC))
return IRQ_HANDLED;

/* Check Attention Button Pressed */
if (events & PCI_EXP_SLTSTA_ABP) {
ctrl_info(ctrl, "Button pressed on Slot(%s)\n",
Expand Down

0 comments on commit 4947793

Please sign in to comment.