PCI: enhance physical slot debug information
PATCH 1/1 PCI: enhance physical slot debug information
Convert usages of pr_debug to dev_dbg and add physical slot name.
Note that we use dev_dbg on the struct pci_bus and still manually print out the PCI slot number (instead of calling dev_dbg on a pci_dev) because a struct pci_bus with empty physical slots will not have any pci_devs.
---
Jesse, since this is all under #ifdef DEBUG, it's your call whether you want to queue it for .29 or .30. Doesn't matter much to us either way, thanks.
--- slot.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/pci/slot.c +8 -10
@@ -1,8 +1,8 @@/* * drivers/pci/slot.c * Copyright (C) 2006 Matthew Wilcox <[email protected]> -* Copyright (C) 2006-2008 Hewlett-Packard Development Company, L.P. -* Alex Chiang <[email protected]> +* Copyright (C) 2006-2009 Hewlett-Packard Development Company, L.P. +* Alex Chiang <[email protected]> */ #include <linux/kobject.h>
@@ -52,8 +52,8 @@ static void pci_slot_release(struct kobject *kobj)struct pci_dev *dev;struct pci_slot *slot =to_pci_slot (kobj); -pr_debug ("%s: releasing pci_slot on %x:%d\n" , __func__, - slot->bus->number, slot->number); +dev_dbg (&slot->bus->dev,"dev %02x, released physical slot %s\n" , + slot->number,pci_slot_name (slot));list_for_each_entry (dev, &slot->bus->devices, bus_list)if (PCI_SLOT (dev->devfn) == slot->number)
@@ -248,9 +248,8 @@ placeholder:if (PCI_SLOT (dev->devfn) == slot_nr) dev->slot = slot; -/* Don't care if debug printk has a -1 for slot_nr */ -pr_debug ("%s: created pci_slot on %04x:%02x:%02x\n" , - __func__,pci_domain_nr (parent), parent->number, slot_nr); +dev_dbg (&parent->dev,"dev %02x, created physical slot %s\n" , + slot_nr,pci_slot_name (slot)); out:kfree (slot_name);
@@ -299,9 +298,8 @@ EXPORT_SYMBOL_GPL(pci_renumber_slot);*/ void pci_destroy_slot (struct pci_slot *slot) { -pr_debug ("%s: dec refcount to %d on %04x:%02x:%02x\n" , __func__, -atomic_read (&slot->kobj.kref.refcount) -1 , -pci_domain_nr (slot->bus), slot->bus->number, slot->number); +dev_dbg (&slot->bus->dev,"dev %02x, dec refcount to %d\n" , + slot->number,atomic_read (&slot->kobj.kref.refcount) -1 );down_write (&pci_bus_sem);kobject_put (&slot->kobj);
Quoted 7 lines · Alex Chiang
Convert usages of
pr_debugtodev_dbgand add physical slot name.Note that we use
dev_dbgon the structpci_busand still manually print out the PCI slot number (instead of callingdev_dbgon apci_dev) because a structpci_buswith empty physical slots will not have anypci_devs.
Quoted 6 lines
Reviewed-by Andrew Patterson <[email protected]>Signed-off-by Alex Chiang <[email protected]>---
Jesse, since this is all under #ifdef DEBUG, it's your call whether you want to queue it for .29 or .30. Doesn't matter much to us either way, thanks.
Just applied this to my linux-next branch. Thanks.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center