diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2023-06-26 12:59:56 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2023-06-26 12:59:56 -0500 |
| commit | db5ccb2eda47ab4ec5ac6cece0032d75a995d5a4 (patch) | |
| tree | 5411ad7a024084146ba419dc587762cc021e1186 /drivers/pci/hotplug/pciehp_hpc.c | |
| parent | 1abb47390350a1bd5430390e296492e6248865b2 (diff) | |
| parent | 40613da52b13fb21c5566f10b287e0ca8c12c4e9 (diff) | |
| download | linux-db5ccb2eda47ab4ec5ac6cece0032d75a995d5a4.tar.gz linux-db5ccb2eda47ab4ec5ac6cece0032d75a995d5a4.tar.bz2 linux-db5ccb2eda47ab4ec5ac6cece0032d75a995d5a4.zip | |
Merge branch 'pci/hotplug'
- Simplify Attention Button logging (Bjorn Helgaas)
- Cancel bringup sequence if card is not present, to keep from blinking
Power Indicator indefinitely (Rongguang Wei)
- Reassign bridge resources if necessary for ACPI hotplug (Igor Mammedov)
* pci/hotplug:
PCI: acpiphp: Reassign resources on bridge if necessary
PCI: pciehp: Cancel bringup sequence if card is not present
PCI: pciehp: Simplify Attention Button logging
Diffstat (limited to 'drivers/pci/hotplug/pciehp_hpc.c')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_hpc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 6bf898e1ca62..8711325605f0 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -722,11 +722,8 @@ static irqreturn_t pciehp_ist(int irq, void *dev_id) } /* Check Attention Button Pressed */ - if (events & PCI_EXP_SLTSTA_ABP) { - ctrl_info(ctrl, "Slot(%s): Attention button pressed\n", - slot_name(ctrl)); + if (events & PCI_EXP_SLTSTA_ABP) pciehp_handle_button_press(ctrl); - } /* Check Power Fault Detected */ if (events & PCI_EXP_SLTSTA_PFD) { |