diff options
-rw-r--r-- | drivers/pci/hotplug/pciehp_hpc.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 6a2365cd794e..e121f1c06c21 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c | |||
@@ -232,8 +232,8 @@ static bool pci_bus_check_dev(struct pci_bus *bus, int devfn) | |||
232 | delay -= step; | 232 | delay -= step; |
233 | } while (delay > 0); | 233 | } while (delay > 0); |
234 | 234 | ||
235 | if (count > 1 && pciehp_debug) | 235 | if (count > 1) |
236 | printk(KERN_DEBUG "pci %04x:%02x:%02x.%d id reading try %d times with interval %d ms to get %08x\n", | 236 | dbg("pci %04x:%02x:%02x.%d id reading try %d times with interval %d ms to get %08x\n", |
237 | pci_domain_nr(bus), bus->number, PCI_SLOT(devfn), | 237 | pci_domain_nr(bus), bus->number, PCI_SLOT(devfn), |
238 | PCI_FUNC(devfn), count, step, l); | 238 | PCI_FUNC(devfn), count, step, l); |
239 | 239 | ||
@@ -822,14 +822,11 @@ static inline void dbg_ctrl(struct controller *ctrl) | |||
822 | struct pci_dev *pdev = ctrl->pcie->port; | 822 | struct pci_dev *pdev = ctrl->pcie->port; |
823 | u16 reg16; | 823 | u16 reg16; |
824 | 824 | ||
825 | if (!pciehp_debug) | 825 | ctrl_dbg(ctrl, "Slot Capabilities : 0x%08x\n", ctrl->slot_cap); |
826 | return; | ||
827 | |||
828 | ctrl_info(ctrl, "Slot Capabilities : 0x%08x\n", ctrl->slot_cap); | ||
829 | pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, ®16); | 826 | pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, ®16); |
830 | ctrl_info(ctrl, "Slot Status : 0x%04x\n", reg16); | 827 | ctrl_dbg(ctrl, "Slot Status : 0x%04x\n", reg16); |
831 | pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, ®16); | 828 | pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, ®16); |
832 | ctrl_info(ctrl, "Slot Control : 0x%04x\n", reg16); | 829 | ctrl_dbg(ctrl, "Slot Control : 0x%04x\n", reg16); |
833 | } | 830 | } |
834 | 831 | ||
835 | #define FLAG(x, y) (((x) & (y)) ? '+' : '-') | 832 | #define FLAG(x, y) (((x) & (y)) ? '+' : '-') |