PCI: print resources consistently with %pR

[safe/jmp/linux-2.6] / drivers / pci / access.c

diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 3814447..db23200 100644 (file)
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -66,6 +66,25 @@ EXPORT_SYMBOL(pci_bus_write_config_byte);
 EXPORT_SYMBOL(pci_bus_write_config_word);
 EXPORT_SYMBOL(pci_bus_write_config_dword);
 
+/**
+ * pci_bus_set_ops - Set raw operations of pci bus
+ * @bus:       pci bus struct
+ * @ops:       new raw operations
+ *
+ * Return previous raw operations
+ */
+struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, struct pci_ops *ops)
+{
+       struct pci_ops *old_ops;
+       unsigned long flags;
+
+       spin_lock_irqsave(&pci_lock, flags);
+       old_ops = bus->ops;
+       bus->ops = ops;
+       spin_unlock_irqrestore(&pci_lock, flags);
+       return old_ops;
+}
+EXPORT_SYMBOL(pci_bus_set_ops);
 
 /**
  * pci_read_vpd - Read one entry from Vital Product Data
@@ -87,8 +106,8 @@ EXPORT_SYMBOL(pci_read_vpd);
  * pci_write_vpd - Write entry to Vital Product Data
  * @dev:       pci device struct
  * @pos:       offset in vpd space
- * @count:     number of bytes to read
- * @val:       value to write
+ * @count:     number of bytes to write
+ * @buf:       buffer containing write data
  *
  */
 ssize_t pci_write_vpd(struct pci_dev *dev, loff_t pos, size_t count, const void *buf)
@@ -356,7 +375,8 @@ int pci_vpd_truncate(struct pci_dev *dev, size_t size)
                return -EINVAL;
 
        dev->vpd->len = size;
-       dev->vpd->attr->size = size;
+       if (dev->vpd->attr)
+               dev->vpd->attr->size = size;
 
        return 0;
 }